Merge pull request #516 from HttpRunner/bugfix

bugfixes with Chinese charactors

httprunner/logger.py

@@ -37,7 +37,7 @@ def setup_logger(log_level, log_file=None):
     )
 
     if log_file:
-        handler = logging.FileHandler(log_file)
+        handler = logging.FileHandler(log_file, encoding="utf-8")
     else:
         handler = logging.StreamHandler()
 

httprunner/utils.py

@@ -661,7 +661,13 @@ def dump_json_file(json_data, pwd_dir_path, dump_file_name):
                     ))
                 )
             else:
-                json.dump(json_data, outfile, indent=4, separators=(',', ':'))
+                json.dump(
+                    json_data,
+                    outfile,
+                    indent=4,
+                    separators=(',', ':'),
+                    ensure_ascii=False
+                )
 
         msg = "dump file: {}".format(dump_file_path)
         logger.color_print(msg, "BLUE")

tests/debugtalk.py

@@ -89,8 +89,8 @@ def teardown_hook_sleep_N_secs(response, n_secs):
 def hook_print(msg):
     print(msg)
 
-def modify_headers_os_platform(request, os_platform):
-    request["headers"]["os_platform"] = os_platform
+def modify_request_json(request, os_platform):
+    request["json"]["os_platform"] = os_platform
 
 def setup_hook_httpntlmauth(request):
     if "httpntlmauth" in request:

tests/test_runner.py

@@ -164,19 +164,19 @@ class TestRunner(ApiServerUnittest):
                 "method": "POST",
                 "headers": {
                     "content-type": "application/json",
-                    "user_agent": "iOS/10.3",
-                    "os_platform": "ios"
+                    "user_agent": "iOS/10.3"
                 },
                 "json": {
+                    "os_platform": "ios",
                     "sign": "f1219719911caae89ccc301679857ebfda115ca2"
                 }
             },
             "setup_hooks": [
-                "${modify_headers_os_platform($request, android)}"
+                "${modify_request_json($request, android)}"
             ],
             "validate": [
                 {"check": "status_code", "expect": 200},
-                {"check": "content.headers.Os-Platform", "expect": "android"}
+                {"check": "content.json.os_platform", "expect": "android"}
             ]
         }
         test_runner = runner.Runner(config_dict, self.debugtalk_functions)