sync master code

Signed-off-by: Nalex__hold <hejian3@huawei.com>

extension/src/xdevice_extension/_core/driver/drivers.py

@@ -1597,7 +1597,14 @@ class JSUnitTestDriver(IDriver):
                     request.root.source.source_string, error_no="00110")
 
             LOG.debug("Test case file path: %s" % suite_file)
-            self.config.device.hdc_command("shell hilog -r")
+            # avoid hilog service stuck issue
+            self.config.device.hdc_command("shell stop_service hilogd",
+                                           timeout=30 * 1000)
+            self.config.device.hdc_command("shell start_service hilogd",
+                                           timeout=30 * 1000)
+            time.sleep(10)
+
+            self.config.device.hdc_command("shell hilog -r", timeout=30 * 1000)
             self._run_jsunit(config_file, request)
         except Exception as exception:
             self.error_message = exception

extension/src/xdevice_extension/_core/environment/device.py

@@ -38,7 +38,7 @@ from xdevice_extension._core.utils import convert_serial
 from xdevice_extension._core.constants import DeviceConnectorType
 
 __all__ = ["Device"]
-TIMEOUT = 300 * 1000
+TIMEOUT = 90 * 1000
 RETRY_ATTEMPTS = 2
 DEFAULT_UNAVAILABLE_TIMEOUT = 20 * 1000
 BACKGROUND_TIME = 2 * 60 * 1000
@@ -174,7 +174,7 @@ class Device(IDevice):
         """
         Hdc command, ddmlib function.
         """
-        command = "getparam %s" % prop_name
+        command = "param get %s" % prop_name
         stdout = self.execute_shell_command(
             command, timeout=5 * 1000, output_flag=False, retry=retry,
             abort_on_exception=abort_on_exception).strip()

extension/src/xdevice_extension/_core/testkit/kit.py

@@ -560,8 +560,8 @@ class AppInstallKit(ITestKit):
                 LOG.error("The app file {} does not exist".format(app))
                 continue
             if app_file.endswith(".hap"):
-                # use app install command directly
-                device.hdc_command("app install {}".format(app_file))
+                # use install command directly
+                device.hdc_command("install {}".format(app_file))
             else:
                 result = device.install_package(
                     app_file, get_install_args(
@@ -579,7 +579,7 @@ class AppInstallKit(ITestKit):
                 app_name = get_app_name(app)
 
                 if app_name:
-                    device.hdc_command("shell bm uninstall -n {}".
+                    device.hdc_command("uninstall {}".
                                        format(app_name))
                     time.sleep(20)
                 else:

src/xdevice/_core/executor/scheduler.py

@@ -1022,8 +1022,11 @@ class Scheduler(object):
 
     @classmethod
     def upload_report_end(cls):
+        LOG.info("Upload report end")
+        if Scheduler.proxy is not None:
+            Scheduler.proxy.report_end()
+            return
         from agent.factory import report_end
-        LOG.info("upload report end")
         report_end()
 
     @classmethod