From 895478719d72dcf257136f1bc1fb43bf64bb7229 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Thu, 2 Nov 2017 20:40:56 +0800 Subject: [PATCH] make logging string unicode --- ate/client.py | 2 +- ate/response.py | 18 +++++++++--------- ate/runner.py | 11 ++++++----- ate/testcase.py | 10 +++++----- ate/utils.py | 2 +- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/ate/client.py b/ate/client.py index 26b7d9fa..a94a3ce7 100644 --- a/ate/client.py +++ b/ate/client.py @@ -136,7 +136,7 @@ class HttpSession(requests.Session): try: response.raise_for_status() except RequestException as e: - logging.error(" Failed to {method} {url}! exception msg: {exception}".format( + logging.error(u" Failed to {method} {url}! exception msg: {exception}".format( method=method, url=url, exception=str(e))) else: logging.info( diff --git a/ate/response.py b/ate/response.py index ebd8bf7e..cb38038b 100644 --- a/ate/response.py +++ b/ate/response.py @@ -42,9 +42,9 @@ class ResponseObject(object): """ matched = re.search(field, self.resp_text) if not matched: - err_msg = "Extractor error: failed to extract data with regex!\n" - err_msg += "response body: {}\n".format(self.resp_text) - err_msg += "regex: {}\n".format(field) + err_msg = u"Extractor error: failed to extract data with regex!\n" + err_msg += u"response body: {}\n".format(self.resp_text) + err_msg += u"regex: {}\n".format(field) logging.error(err_msg) raise exception.ParamsError(err_msg) @@ -75,9 +75,9 @@ class ResponseObject(object): if sub_query: if not isinstance(top_query_content, (dict, CaseInsensitiveDict, list)): - err_msg = "Extractor error: failed to extract data with regex!\n" - err_msg += "response: {}\n".format(self.parsed_dict()) - err_msg += "regex: {}\n".format(field) + err_msg = u"Extractor error: failed to extract data with regex!\n" + err_msg += u"response: {}\n".format(self.parsed_dict()) + err_msg += u"regex: {}\n".format(field) logging.error(err_msg) raise exception.ParamsError(err_msg) @@ -88,9 +88,9 @@ class ResponseObject(object): return top_query_content except AttributeError: - err_msg = "Failed to extract value from response!\n" - err_msg += "response: {}\n".format(self.parsed_dict()) - err_msg += "extract field: {}\n".format(field) + err_msg = u"Failed to extract value from response!\n" + err_msg += u"response: {}\n".format(self.parsed_dict()) + err_msg += u"extract field: {}\n".format(field) logging.error(err_msg) raise exception.ParamsError(err_msg) diff --git a/ate/runner.py b/ate/runner.py index bbfa7f39..5a5b6434 100644 --- a/ate/runner.py +++ b/ate/runner.py @@ -131,11 +131,12 @@ class Runner(object): try: resp_obj.validate(validators, self.context.get_testcase_variables_mapping()) except (exception.ParamsError, exception.ResponseError, exception.ValidationError): - logging.error("Exception occured.") - logging.error("HTTP request url: \n{}".format(url)) - logging.error("HTTP request kwargs: \n{}".format(parsed_request)) - logging.error("HTTP response status_code: \n{}".format(resp.status_code)) - logging.error("HTTP response content: \n{}".format(resp.text)) + err_msg = u"Exception occured.\n" + err_msg += u"HTTP request url: {}\n".format(url) + err_msg += u"HTTP request kwargs: \n{}".format(parsed_request) + err_msg += u"HTTP response status_code: {}\n".format(resp.status_code) + err_msg += u"HTTP response content: \n{}".format(resp.text) + logging.error(err_msg) raise setup_teardown(teardown_actions) diff --git a/ate/testcase.py b/ate/testcase.py index 437bcdd5..da2f04af 100644 --- a/ate/testcase.py +++ b/ate/testcase.py @@ -34,7 +34,7 @@ def _load_json_file(json_file): try: json_content = json.load(data_file) except exception.JSONDecodeError: - err_msg = "JSONDecodeError: JSON file format error: {}".format(json_file) + err_msg = u"JSONDecodeError: JSON file format error: {}".format(json_file) logging.error(err_msg) raise exception.FileFormatError(err_msg) @@ -49,7 +49,7 @@ def _load_file(testcase_file_path): return _load_yaml_file(testcase_file_path) else: # '' or other suffix - err_msg = "file is not in YAML/JSON format: {}".format(testcase_file_path) + err_msg = u"file is not in YAML/JSON format: {}".format(testcase_file_path) logging.warning(err_msg) return [] @@ -206,7 +206,7 @@ def load_testcases_by_path(path): testcases_list = [] else: - logging.error("file not found: {}".format(path)) + logging.error(u"file not found: {}".format(path)) testcases_list = [] testcases_cache_mapping[path] = testcases_list @@ -373,13 +373,13 @@ def check_format(file_path, content): """ if not content: # testcase file content is empty - err_msg = "Testcase file content is empty: {}".format(file_path) + err_msg = u"Testcase file content is empty: {}".format(file_path) logging.error(err_msg) raise exception.FileFormatError(err_msg) elif not isinstance(content, (list, dict)): # testcase file content does not match testcase format - err_msg = "Testcase file content format invalid: {}".format(file_path) + err_msg = u"Testcase file content format invalid: {}".format(file_path) logging.error(err_msg) raise exception.FileFormatError(err_msg) diff --git a/ate/utils.py b/ate/utils.py index 1f914396..10176a7a 100644 --- a/ate/utils.py +++ b/ate/utils.py @@ -398,7 +398,7 @@ def create_scaffold(project_path): if os.path.isdir(project_path): folder_name = os.path.basename(project_path) - logging.warning(" Folder {} exists, please specify a new folder name.".format(folder_name)) + logging.warning(u" Folder {} exists, please specify a new folder name.".format(folder_name)) return def create_path(path, ptype):