From 32109fd2b5469c41d56f78e2bc026956c3cf3d29 Mon Sep 17 00:00:00 2001 From: yuyan0428 Date: Fri, 16 Sep 2022 01:36:44 +0000 Subject: [PATCH 1/3] fixed 4d6c6e5 from https://gitee.com/yuyan0428/test_developertest/pulls/197 Signed-off-by: yuyan0428 Signed-off-by: yuyan0428 --- aw/python/distributed/common/drivers.py | 2 +- examples/detector/src/detector.cpp | 2 ++ src/core/command/parameter.py | 2 +- src/core/command/run.py | 2 +- src/core/driver/drivers.py | 9 +++++---- src/core/driver/lite_driver.py | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/aw/python/distributed/common/drivers.py b/aw/python/distributed/common/drivers.py index 66ed296..7bc4353 100755 --- a/aw/python/distributed/common/drivers.py +++ b/aw/python/distributed/common/drivers.py @@ -37,7 +37,7 @@ def get_level_para_string(level_string): if not item.isdigit(): continue item = item.strip(" ") - level_para_string += ("Level%s," % item) + level_para_string = (f"{level_para_string}Level{item},") level_para_string = level_para_string.strip(",") return level_para_string diff --git a/examples/detector/src/detector.cpp b/examples/detector/src/detector.cpp index 9f84764..a354fff 100644 --- a/examples/detector/src/detector.cpp +++ b/examples/detector/src/detector.cpp @@ -26,6 +26,7 @@ namespace DetectorTest { const int START_INDEX = 3; } +namespace{ bool IsPrime(int n) { if (n <= 1) { @@ -56,3 +57,4 @@ bool FileExist(const char* fileName) struct stat myStat; return (!stat(fileName, &myStat)); } +} diff --git a/src/core/command/parameter.py b/src/core/command/parameter.py index dd69ec3..67cbd7b 100755 --- a/src/core/command/parameter.py +++ b/src/core/command/parameter.py @@ -49,7 +49,7 @@ class Parameter(object): if check_flag: for item in level_list: item = item.strip(" ") - test_level_string += (item + ",") + test_level_string = f"{test_level_string}{item}," test_level_string = test_level_string.strip(",") return test_level_string diff --git a/src/core/command/run.py b/src/core/command/run.py index 392281e..7e65cf9 100755 --- a/src/core/command/run.py +++ b/src/core/command/run.py @@ -108,7 +108,7 @@ class Run(object): print("The latest command history is: %d" % len(self.history_cmd_list)) for index in range(0, len(self.history_cmd_list)): cmd_record = self.history_cmd_list[index] - print("%d. [%s]-[%s]::[%s]" % (index+1, cmd_record["time"], + print("%d. [%s] - [%s]::[%s]" % (index + 1, cmd_record["time"], cmd_record["raw_cmd"], cmd_record["result"])) return #重新运行历史里的一条命令 diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index e1e418f..7c721ce 100755 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -122,7 +122,7 @@ def get_level_para_string(level_string): if not item.isdigit(): continue item = item.strip(" ") - level_para_string += ("Level%s," % item) + level_para_string = f"{level_para_string}Level{item}," level_para_string = level_para_string.strip(",") return level_para_string @@ -409,7 +409,8 @@ class ResultManager(object): "cd %s; tar -czf %s.tar.gz %s" % (DEFAULT_TEST_PATH, target_name, target_name)) src_file_tar = os.path.join(DEFAULT_TEST_PATH, "%s.tar.gz" % target_name) self.device.pull_file(src_file_tar, cxx_cov_path, is_create=True, timeout=TIME_OUT) - result = os.popen("tar -zxf %s -C %s" % (os.path.join(cxx_cov_path, "%s.tar.gz" % target_name), cxx_cov_path)) + result = os.popen("tar -zxf %s -C %s" % ( + os.path.join(cxx_cov_path, "%s.tar.gz" % target_name), cxx_cov_path)) result.close() if platform.system() == "Windows": os.remove("%s" % os.path.join(cxx_cov_path, "%s.tar.gz" % target_name)) @@ -792,7 +793,7 @@ class JSUnitTestDriver(IDriver): _unlock_device(self.config.device) try: - return_message = self.start_hap_activity() + return_message = self.start_hap_execute() except (ExecuteTerminate, DeviceError) as exception: return_message = str(exception.args) @@ -813,7 +814,7 @@ class JSUnitTestDriver(IDriver): _sleep_according_to_result(return_code) return return_code - def start_hap_activity(self): + def start_hap_execute(self): try: command = "aa start -d 123 -a %s.MainAbility -b %s" \ % (self.package_name, self.package_name) diff --git a/src/core/driver/lite_driver.py b/src/core/driver/lite_driver.py index 603f2e2..024db50 100755 --- a/src/core/driver/lite_driver.py +++ b/src/core/driver/lite_driver.py @@ -56,7 +56,7 @@ def get_level_para_string(level_string): if not item.isdigit(): continue item = item.strip(" ") - level_para_string += ("Level%s," % item) + level_para_string = f"{level_para_string}Level{item}," level_para_string = level_para_string.strip(",") return level_para_string -- Gitee From 0de7b7901bc9acbecc99a4a242dc91ecad16814d Mon Sep 17 00:00:00 2001 From: yuyan0428 Date: Sat, 17 Sep 2022 02:34:36 +0000 Subject: [PATCH 2/3] Signed-off-by: yuyan0428 Signed-off-by: yuyan0428 --- src/core/driver/drivers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index e1e418f..d3bd464 100755 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -414,7 +414,7 @@ class ResultManager(object): if platform.system() == "Windows": os.remove("%s" % os.path.join(cxx_cov_path, "%s.tar.gz" % target_name)) else: - os.system("rm -rf %s" % os.path.join(cxx_cov_path, "%s.tar.gz" % target_name)) + subprocess.Popen("rm -rf %s" % os.path.join(cxx_cov_path, "%s.tar.gz" % target_name), shell=True) ############################################################################## -- Gitee From c4ea8404ed175db5e2aa3d17cafd38e7feb3f5bb Mon Sep 17 00:00:00 2001 From: yuyan0428 Date: Mon, 26 Sep 2022 07:09:30 +0000 Subject: [PATCH 3/3] Signed-off-by: yuyan0428 Signed-off-by: yuyan0428 --- examples/detector/src/detector.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/detector/src/detector.cpp b/examples/detector/src/detector.cpp index a354fff..b581a5d 100644 --- a/examples/detector/src/detector.cpp +++ b/examples/detector/src/detector.cpp @@ -26,7 +26,7 @@ namespace DetectorTest { const int START_INDEX = 3; } -namespace{ +namespace { bool IsPrime(int n) { if (n <= 1) { -- Gitee