diff --git a/httprunner/builtin/comparators.py b/httprunner/builtin/comparators.py index 91520625..975c868d 100644 --- a/httprunner/builtin/comparators.py +++ b/httprunner/builtin/comparators.py @@ -77,7 +77,7 @@ def type_match(check_value, expect_value): def get_type(name): if isinstance(name, type): return name - elif isinstance(name, str, bytes): + elif isinstance(name, str): try: return __builtins__[name] except KeyError: diff --git a/httprunner/loader/load.py b/httprunner/loader/load.py index 158cf5b3..fcee9ca3 100644 --- a/httprunner/loader/load.py +++ b/httprunner/loader/load.py @@ -38,7 +38,7 @@ def _load_json_file(json_file): with io.open(json_file, encoding='utf-8') as data_file: try: json_content = json.load(data_file) - except exceptions.JSONDecodeError: + except json.JSONDecodeError: err_msg = f"JSONDecodeError: JSON file format error: {json_file}" logger.error(err_msg) raise exceptions.FileFormatError(err_msg) diff --git a/httprunner/response.py b/httprunner/response.py index d3fa78c6..d4d815fb 100644 --- a/httprunner/response.py +++ b/httprunner/response.py @@ -1,3 +1,4 @@ +import json import re from collections import OrderedDict @@ -199,7 +200,7 @@ class ResponseObject(object): elif top_query in ["body", "content", "text", "json"]: try: body = self.json - except exceptions.JSONDecodeError: + except json.JSONDecodeError: body = self.text if not sub_query: diff --git a/tests/test_api.py b/tests/test_api.py index 1ce8884c..948f629d 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -470,7 +470,6 @@ class TestHttpRunner(ApiServerUnittest): self.assertEqual(summary["details"][1]["stat"]["total"], 1) self.assertEqual(summary["details"][2]["stat"]["total"], 1) - def test_run_testcase_hardcode(self): for testcase_file_path in self.testcase_file_path_list: summary = self.runner.run(testcase_file_path) @@ -479,7 +478,6 @@ class TestHttpRunner(ApiServerUnittest): self.assertEqual(summary["stat"]["teststeps"]["total"], 3) self.assertEqual(summary["stat"]["teststeps"]["successes"], 3) - def test_run_testcase_template_variables(self): testcase_file_path = os.path.join( os.getcwd(), 'tests/data/demo_testcase_variables.yml')