GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-07-13 00:11:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #835: UnicodeDecodeError when loading json schema files

Browse Source
This commit is contained in:
debugtalk
2020-01-03 16:34:12 +08:00
parent 3bac9c301f
commit 720c02e6ab
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/CHANGELOG.md
View File

@@ -1,5 +1,12 @@
# Release History # Release History
## 2.5.4 (2020-01-03)
**Fixed**
- fix #835: UnicodeDecodeError when loading json schema files
## 2.5.3 (2020-01-03) ## 2.5.3 (2020-01-03)
**Fixed** **Fixed**

13
httprunner/loader/check.py
View File

@@ -1,3 +1,4 @@
import io
import json import json
import os import os
import platform import platform
@@ -14,10 +15,10 @@ testcase_schema_v2_path = os.path.join(schemas_root_dir, "testcase.schema.v2.jso
testsuite_schema_v1_path = os.path.join(schemas_root_dir, "testsuite.schema.v1.json") testsuite_schema_v1_path = os.path.join(schemas_root_dir, "testsuite.schema.v1.json")
testsuite_schema_v2_path = os.path.join(schemas_root_dir, "testsuite.schema.v2.json") testsuite_schema_v2_path = os.path.join(schemas_root_dir, "testsuite.schema.v2.json")
with open(api_schema_path) as f: with io.open(api_schema_path, encoding='utf-8') as f:
api_schema = json.load(f) api_schema = json.load(f)
with open(common_schema_path) as f: with io.open(common_schema_path, encoding='utf-8') as f:
if platform.system() == "Windows": if platform.system() == "Windows":
absolute_base_path = 'file:///' + os.path.abspath(schemas_root_dir).replace("\\", "/") + '/' absolute_base_path = 'file:///' + os.path.abspath(schemas_root_dir).replace("\\", "/") + '/'
else: else:
@@ -27,16 +28,16 @@ with open(common_schema_path) as f:
common_schema = json.load(f) common_schema = json.load(f)
resolver = jsonschema.RefResolver(absolute_base_path, common_schema) resolver = jsonschema.RefResolver(absolute_base_path, common_schema)
with open(testcase_schema_v1_path) as f: with io.open(testcase_schema_v1_path, encoding='utf-8') as f:
testcase_schema_v1 = json.load(f) testcase_schema_v1 = json.load(f)
with open(testcase_schema_v2_path) as f: with io.open(testcase_schema_v2_path, encoding='utf-8') as f:
testcase_schema_v2 = json.load(f) testcase_schema_v2 = json.load(f)
with open(testsuite_schema_v1_path) as f: with io.open(testsuite_schema_v1_path, encoding='utf-8') as f:
testsuite_schema_v1 = json.load(f) testsuite_schema_v1 = json.load(f)
with open(testsuite_schema_v2_path) as f: with io.open(testsuite_schema_v2_path, encoding='utf-8') as f:
testsuite_schema_v2 = json.load(f) testsuite_schema_v2 = json.load(f)