!149 黄区告警清理-Beta-3.2分支

Merge pull request !149 from mipengwei/OpenHarmony-3.2-Beta2

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

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):

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 ""

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()

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)