From 3ae53b73feed129151c07b82b5f1b5a0303f458b Mon Sep 17 00:00:00 2001 From: mipengwei Date: Tue, 19 Jul 2022 03:02:50 +0000 Subject: [PATCH] Signed-off-by:mipengwei --- aw/python/distributed/common/devices.py | 2 +- aw/python/distributed/common/drivers.py | 2 +- aw/python/distributed/distribute/distribute.py | 6 +++--- src/core/command/display.py | 2 +- src/core/driver/drivers.py | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/aw/python/distributed/common/devices.py b/aw/python/distributed/common/devices.py index 33ffc0f..23b80c7 100755 --- a/aw/python/distributed/common/devices.py +++ b/aw/python/distributed/common/devices.py @@ -87,7 +87,7 @@ class DeviceShell: self.conn_type = conn_type self.device_sn = device_sn self.name = name - self.test_path = "/data/test" + self.test_path = "data/test" if conn_type: self.device_params = self.get_device_hdc_para( device_sn diff --git a/aw/python/distributed/common/drivers.py b/aw/python/distributed/common/drivers.py index 66ed296..f29f246 100755 --- a/aw/python/distributed/common/drivers.py +++ b/aw/python/distributed/common/drivers.py @@ -27,7 +27,7 @@ from core.config.resource_manager import ResourceManager ############################################################################## ############################################################################## -DEVICE_TEST_PATH = "/%s/%s/" % ("data", "test") +DEVICE_TEST_PATH = "%s/%s/" % ("data", "test") def get_level_para_string(level_string): diff --git a/aw/python/distributed/distribute/distribute.py b/aw/python/distributed/distribute/distribute.py index 7c9742e..5cf7828 100755 --- a/aw/python/distributed/distribute/distribute.py +++ b/aw/python/distributed/distribute/distribute.py @@ -288,10 +288,10 @@ class Distribute: softbus_file_path = "out/rk3568/communication/dsoftbus_standard/SoftBusdumpdeviceInfo" file_path = os.path.normpath(os.path.join("../../", sys.framework_root_dir, softbus_file_path)) - device.push_file(file_path, "/data/test") - device.shell_with_output("chmod 777 -R /data/test/") + device.push_file(file_path, "data/test") + device.shell_with_output("chmod 777 -R data/test/") chmod_device_file_path = "SoftBusdumpdeviceInfo" - device_info = device.shell_with_output("/data/test/%s" % chmod_device_file_path) + device_info = device.shell_with_output("data/test/%s" % chmod_device_file_path) if device_info == "": return "" diff --git a/src/core/command/display.py b/src/core/command/display.py index 15d0269..5832316 100755 --- a/src/core/command/display.py +++ b/src/core/command/display.py @@ -297,7 +297,7 @@ def show_subsystem_list(product_form): def show_acts_subsystem_list(): print("List of currently supported acts subsystem names:") sub_list = ['global', 'security', 'useriam', 'multimedia', 'appexecfwk', 'account', 'communication', 'notification', - 'ability', 'miscservices', 'powermgr', 'startup', 'sensor', 'distributeddatamgr', 'update', 'graphic','arkui', + 'ability', 'miscservices', 'powermgr', 'startup', 'sensor', 'distributeddatamgr', 'update', 'graphic', 'arkui', 'storage', 'compileruntime', 'usb', 'multimodalinput', 'resourceschedule', 'telephony', 'hiviewdfx', 'location', 'barrierfree', 'customization'] sub_list.sort() diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index 0c79595..182fcce 100755 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -673,7 +673,7 @@ class JSUnitTestDriver(IDriver): timeout = ResourceManager.get_nodeattrib_data(resource_data_dic) else: timeout = ResourceManager.get_nodeattrib_data(resource_data_dic) - resource_manager.process_preparer_data(resource_data_dic, resource_dir,self.config.device) + resource_manager.process_preparer_data(resource_data_dic, resource_dir, self.config.device) main_result = self._install_hap(suite_file) result = ResultManager(suite_file, self.config) if main_result: @@ -685,7 +685,7 @@ 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) + 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') \ as file_read_pipe: for i in range(0, times): @@ -709,7 +709,7 @@ class JSUnitTestDriver(IDriver): self.result = result.get_test_results("Error: install hap failed") LOG.error("Error: install hap failed") - resource_manager.process_cleaner_data(resource_data_dic, resource_dir,self.config.device) + resource_manager.process_cleaner_data(resource_data_dic, resource_dir, self.config.device) def generate_console_output(self, device_log_file, request): result_message = self.read_device_log(device_log_file) -- Gitee