fix failed unittests

Author: yakkle

.travis.yml

@@ -3,8 +3,13 @@ dist: bionic
 python:
   - "3.7"
 
+install:
+  - virtualenv venv
+  - source venv/bin/activate
+  - pip install -e .[tests]
+
 script:
-  - python setup.py test
+  - python -m pytest -ra
 
 deploy:
   provider: pypi

setup.py

@@ -10,6 +10,10 @@
 with open("requirements.txt") as requirements:
     requires = list(requirements)
 
+extras_requires = {
+    'tests': ['pytest~=6.2.5']
+}
+
 setup(
     name='iconsdk',
     version=version,
@@ -22,6 +26,7 @@
     url='https://github.com/icon-project/icon-sdk-python',
     packages=find_packages(exclude=['tests*']),
     install_requires=requires,
+    extras_require=extras_requires,
     python_requires='~=3.7',
     license='Apache License 2.0',
     classifiers=[

tests/api_call/test_call.py

@@ -12,20 +12,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import requests_mock
 import json
-
 from unittest import main
 from unittest.mock import patch
+
+import requests_mock
+
 from iconsdk.builder.call_builder import CallBuilder
 from tests.api_send.test_send_super import TestSendSuper
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 
 
 @patch('iconsdk.providers.http_provider.HTTPProvider._make_id', return_value=1234)
 class TestCall(TestSendSuper):
 
     def test_call(self, _make_id):
+
         # with from
         test_call = CallBuilder() \
             .from_(self.setting["from"]) \
@@ -49,7 +50,7 @@ def test_call(self, _make_id):
                 }
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.call(test_call)
             actual_request = json.loads(m._adapter.last_request.text)
             self.assertEqual(expected_request, actual_request)
@@ -76,7 +77,7 @@ def test_call_without_params(self, _make_id):
                     "from": self.setting["from"]
                 }
             }
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.call(test_call)
             actual_request = json.loads(m._adapter.last_request.text)
             self.assertEqual(expected_request, actual_request)
@@ -101,7 +102,7 @@ def test_call_without_from(self, _make_id):
                     },
                 }
             }
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.call(test_call)
             actual_request = json.loads(m._adapter.last_request.text)
             self.assertEqual(expected_request, actual_request)

tests/api_debug/test_estimate_step.py

@@ -1,15 +1,18 @@
 import json
+import re
+from unittest.mock import patch
+
 import requests_mock
 
-from unittest.mock import patch
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 from iconsdk.builder.transaction_builder import DeployTransactionBuilder, CallTransactionBuilder
 from iconsdk.builder.transaction_builder import TransactionBuilder, MessageTransactionBuilder
 from tests.api_send.test_send_super import TestSendSuper
+from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 
 
 @patch('iconsdk.providers.http_provider.HTTPProvider._make_id', return_value=1234)
 class TestEstimateStep(TestSendSuper):
+    matcher = re.compile(re.escape(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/debug/v3/") + "?")
 
     def test_estimate_step_with_send_icx_transaction(self, _make_id):
         icx_transaction = TransactionBuilder() \
@@ -46,7 +49,7 @@ def test_estimate_step_with_send_icx_transaction(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/debug/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.estimate_step(icx_transaction)
             actual_request = json.loads(m._adapter.last_request.text)
 
@@ -88,7 +91,7 @@ def test_estimate_step_with_message_transaction(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/debug/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.estimate_step(message_transaction)
             actual_request = json.loads(m._adapter.last_request.text)
 
@@ -138,7 +141,7 @@ def test_estimate_step_with_deploy_transaction(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/debug/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.estimate_step(deploy_transaction)
             actual_request = json.loads(m._adapter.last_request.text)
 
@@ -186,7 +189,7 @@ def test_estimate_step_with_call_transaction(self, _make_id):
                 'result': hex(expected_step),
                 'id': 1234
             }
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/debug/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result = self.icon_service.estimate_step(call_transaction)
             actual_request = json.loads(m._adapter.last_request.text)
 

tests/api_full_response/test_full_response_base.py

@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 from tests.api_send.test_send_super import TestSendSuper
 
 

tests/api_full_response/test_get_balance.py

@@ -12,15 +12,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import requests_mock
-import json
 
+import json
 from unittest import main
 from unittest.mock import patch
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
-from tests.api_full_response.test_full_response_base import TestFullResponseBase
-from tests.api_full_response.example_response import result_success_v3
+
+import requests_mock
+
 from iconsdk.exception import AddressException
+from tests.api_full_response.example_response import result_success_v3
+from tests.api_full_response.test_full_response_base import TestFullResponseBase
 
 
 @patch('iconsdk.providers.http_provider.HTTPProvider._make_id', return_value=1234)
@@ -44,7 +45,7 @@ def test_get_balance_full_response(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result_dict = self.icon_service.get_balance(self.setting['from'], full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_keys = result_dict.keys()

tests/api_full_response/test_get_block_by_hash.py

@@ -14,11 +14,10 @@
 # limitations under the License.
 
 import json
-import requests_mock
-
-from unittest.mock import patch
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 from unittest import main
+from unittest.mock import patch
+
+import requests_mock
 
 from iconsdk.utils.validation import is_block
 from tests.api_full_response.example_response import result_error_v3, result_success_v3
@@ -46,7 +45,7 @@ def test_get_block_by_hash_full_response(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result_dict = self.icon_service.get_block(self.block_hash, full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_keys = result_dict.keys()
@@ -70,7 +69,7 @@ def test_get_block_by_wrong_hash(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json, status_code=400)
+            m.post(self.matcher, json=response_json, status_code=400)
             result_dict = self.icon_service.get_block(invalid_block_hash, full_response=True)
             self.assertEqual(result_dict.keys(), result_error_v3.keys())
 

tests/api_full_response/test_get_block_by_height.py

@@ -14,11 +14,10 @@
 # limitations under the License.
 
 import json
-import requests_mock
-
-from unittest.mock import patch
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 from unittest import main
+from unittest.mock import patch
+
+import requests_mock
 
 from iconsdk.utils.validation import is_block
 from tests.api_full_response.example_response import result_error_v3, result_success_v3
@@ -46,7 +45,7 @@ def test_get_block_by_height_full_response(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result_dict = self.icon_service.get_block(self.block_height, full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_keys = result_dict.keys()
@@ -70,7 +69,7 @@ def test_get_block_by_wrong_height(self, _make_id):
                 "id": 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json, status_code=400)
+            m.post(self.matcher, json=response_json, status_code=400)
             result_dict = self.icon_service.get_block(invalid_block_height, full_response=True)
             self.assertEqual(result_dict.keys(), result_error_v3.keys())
 

tests/api_full_response/test_get_last_block.py

@@ -14,11 +14,10 @@
 # limitations under the License.
 
 import json
-import requests_mock
-
-from unittest.mock import patch
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 from unittest import main
+from unittest.mock import patch
+
+import requests_mock
 
 from iconsdk.utils.validation import is_block
 from tests.api_full_response.example_response import result_success_v3
@@ -43,7 +42,7 @@ def test_get_last_block_full_response(self, _make_id):
                 'id': 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result_dict = self.icon_service.get_block("latest", full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_keys = result_dict.keys()

tests/api_full_response/test_get_score_api.py

@@ -13,14 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import requests_mock
 import json
-
-from unittest.mock import patch
 from unittest import main
+from unittest.mock import patch
+
+import requests_mock
 
 from iconsdk.utils.validation import is_score_apis
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 from tests.api_full_response.example_response import result_success_v3, result_error_v3
 from tests.api_full_response.test_full_response_base import TestFullResponseBase
 
@@ -40,7 +39,7 @@ def test_get_score_api_full_response(self, _make_id):
                 }
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_governance_json)
+            m.post(self.matcher, json=response_governance_json)
             result_dict = self.icon_service.get_score_api(governance_address, full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_content = result_dict['result']
@@ -61,7 +60,7 @@ def test_get_score_api_by_wrong_address(self, _make_id):
                 },
                 "id": 1234
             }
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json, status_code=400)
+            m.post(self.matcher, json=response_json, status_code=400)
             result_dict = self.icon_service.get_score_api(wrong_address, full_response=True)
             self.assertEqual(result_dict.keys(), result_error_v3.keys())
 

tests/api_full_response/test_get_total_supply.py

@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import requests_mock
 import json
-
 from unittest import main
 from unittest.mock import patch
+
+import requests_mock
+
 from tests.api_full_response.example_response import result_success_v3
 from tests.api_full_response.test_full_response_base import TestFullResponseBase
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 
 
 @patch('iconsdk.providers.http_provider.HTTPProvider._make_id', return_value=1234)
@@ -40,7 +40,7 @@ def test_get_total_supply(self, _make_id):
                 'result': hex(supply),
                 'id': 1234
             }
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result_dict = self.icon_service.get_total_supply(full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_content = result_dict['result']

tests/api_full_response/test_get_transaction_by_hash.py

@@ -12,16 +12,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import requests_mock
 import json
-
 from unittest import main
 from unittest.mock import patch
 
+import requests_mock
+
 from iconsdk.utils.validation import is_transaction
 from tests.api_full_response.example_response import result_success_v3, result_error_v3
 from tests.api_full_response.test_full_response_base import TestFullResponseBase
-from tests.example_config import BASE_DOMAIN_URL_V3_FOR_TEST
 
 
 @patch('iconsdk.providers.http_provider.HTTPProvider._make_id', return_value=1234)
@@ -43,7 +42,7 @@ def test_get_transaction_by_hash(self, _make_id):
                 "id": 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json)
+            m.post(self.matcher, json=response_json)
             result_dict = self.icon_service.get_transaction(self.transaction_hash, full_response=True)
             actual_request = json.loads(m._adapter.last_request.text)
             result_content = result_dict['result']
@@ -64,7 +63,7 @@ def test_get_transaction_wrong_hash(self, _make_id):
                 "id": 1234
             }
 
-            m.post(f"{BASE_DOMAIN_URL_V3_FOR_TEST}/api/v3/", json=response_json, status_code=400)
+            m.post(self.matcher, json=response_json, status_code=400)
             result_dict = self.icon_service.get_block(wrong_tx_hash, full_response=True)
             self.assertEqual(result_dict.keys(), result_error_v3.keys())