From b2a596f36bf3a4d63eb24ba0166cb91b1de8c870 Mon Sep 17 00:00:00 2001 From: lizhengrong Date: Fri, 5 Apr 2024 22:01:20 +0800 Subject: [PATCH 1/2] Signed-off-by:lizhengrong --- src/core/driver/drivers.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index d9821f5..bb8adf7 100644 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -57,7 +57,7 @@ __all__ = [ LOG = platform_logger("Drivers") DEFAULT_TEST_PATH = "/%s/%s/" % ("data", "test") OBJ = "obj" - +_ACE_LOG_MARKER = " A0C0D0" TIME_OUT = 900 * 1000 JS_TIMEOUT = 10 CYCLE_TIMES = 30 @@ -930,7 +930,7 @@ class JSUnitTestDriver(IDriver): actiontime = timeout times = 1 device_log_file_open = os.open(device_log_file, os.O_RDONLY, stat.S_IWUSR | stat.S_IRUSR) - with os.fdopen(device_log_file_open, "r", encoding='utf-8') \ + with os.fdopen(device_log_file_open, "r", encoding='cp1252') \ as file_read_pipe: for i in range(0, times): if status: @@ -940,7 +940,7 @@ class JSUnitTestDriver(IDriver): start_time = int(time.time()) while True: data = file_read_pipe.readline() - if data.find("JSApp:") != -1 and data.find("[end] run suites end") != -1: + if data.find(_ACE_LOG_MARKER) != -1 and data.find("[end] run suites end") != -1: LOG.info("execute testcase successfully.") status = True break @@ -981,14 +981,14 @@ class JSUnitTestDriver(IDriver): stat.S_IWUSR | stat.S_IRUSR) result_message = "" - with os.fdopen(device_log_file_open, "r", encoding='utf-8') \ + with os.fdopen(device_log_file_open, "r", encoding='cp1252') \ as file_read_pipe: while True: data = file_read_pipe.readline() if not data: break # only filter JSApp log - if data.find("JSApp:") != -1: + if data.find("_ACE_LOG_MARKER") != -1: result_message += data if data.find("[end] run suites end") != -1: break @@ -1094,7 +1094,7 @@ class JSUnitTestDriver(IDriver): @classmethod def _get_json_shell_timeout(cls, json_filepath): - test_timeout = 300 + test_timeout = 0 try: with open(json_filepath, 'r') as json_file: data_dic = json.load(json_file) -- Gitee From 44067c7fa8bc8bb083279e68e6e4f12f2a8f48b1 Mon Sep 17 00:00:00 2001 From: lizhengrong Date: Sat, 6 Apr 2024 19:52:07 +0800 Subject: [PATCH 2/2] Signed-off-by:lizhengrong --- src/core/driver/drivers.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index bb8adf7..62e0c4b 100644 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -929,9 +929,8 @@ class JSUnitTestDriver(IDriver): if timeout: actiontime = timeout times = 1 - device_log_file_open = os.open(device_log_file, os.O_RDONLY, stat.S_IWUSR | stat.S_IRUSR) - with os.fdopen(device_log_file_open, "r", encoding='cp1252') \ - as file_read_pipe: + with open(device_log_file, "r", encoding='utf-8', + errors='ignore') as file_read_pipe: for i in range(0, times): if status: break @@ -977,12 +976,9 @@ class JSUnitTestDriver(IDriver): process_command_ret(result_message, handler) def read_device_log(self, device_log_file): - device_log_file_open = os.open(device_log_file, os.O_RDONLY, - stat.S_IWUSR | stat.S_IRUSR) - result_message = "" - with os.fdopen(device_log_file_open, "r", encoding='cp1252') \ - as file_read_pipe: + with open(device_log_file, "r", encoding='utf-8', + errors='ignore') as file_read_pipe: while True: data = file_read_pipe.readline() if not data: -- Gitee