diff --git a/aw/python/distributed/common/drivers.py b/aw/python/distributed/common/drivers.py index 66ed2964ea25fd8dba1d751b85e91ee09cf0bc64..7bc4353b0dcf2afccf8eaffbeb01dba0c3823b1f 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 9f84764ba2144982c3e0dfb3ce0d197a6905ece8..b581a5d7364d27a75db236d8e408ace983afc4a8 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 dd69ec38e4b91f1096c00a3c2e22426304ffe16f..67cbd7b9f2dcb1787e2bf4c9e9ad329162117b22 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 392281e681cbbf3a76b3239403639841161a6594..7e65cf9f50606acd3adebd8343e40ebbac9faaad 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 e1e418f9c3709af7c4f125edd1fe9de2bed242ca..24c34b6de7225b21b3e6035e29636bdfb7985b4c 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,12 +409,13 @@ 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)) 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) ############################################################################## @@ -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 603f2e21ef5efaa75d4d263833d548cd6d3579b7..024db50c5272203d089955138fa90b441bb2a118 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