From e2448c80077154df2594882bcfb375c1da642f6d Mon Sep 17 00:00:00 2001 From: alex__hold Date: Mon, 15 Nov 2021 19:32:17 +0800 Subject: [PATCH] sync master code Signed-off-by: alex__hold --- extension/src/xdevice_extension/_core/driver/drivers.py | 9 ++++++++- .../src/xdevice_extension/_core/environment/device.py | 4 ++-- extension/src/xdevice_extension/_core/testkit/kit.py | 6 +++--- run.sh | 0 src/xdevice/_core/executor/scheduler.py | 5 ++++- 5 files changed, 17 insertions(+), 7 deletions(-) mode change 100644 => 100755 run.sh diff --git a/extension/src/xdevice_extension/_core/driver/drivers.py b/extension/src/xdevice_extension/_core/driver/drivers.py index 0fc3712..7b2bcab 100644 --- a/extension/src/xdevice_extension/_core/driver/drivers.py +++ b/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 diff --git a/extension/src/xdevice_extension/_core/environment/device.py b/extension/src/xdevice_extension/_core/environment/device.py index 321db77..21d87ee 100644 --- a/extension/src/xdevice_extension/_core/environment/device.py +++ b/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() diff --git a/extension/src/xdevice_extension/_core/testkit/kit.py b/extension/src/xdevice_extension/_core/testkit/kit.py index fc6806a..e7f65a3 100644 --- a/extension/src/xdevice_extension/_core/testkit/kit.py +++ b/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: diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 diff --git a/src/xdevice/_core/executor/scheduler.py b/src/xdevice/_core/executor/scheduler.py index d8cdda6..fdc0795 100644 --- a/src/xdevice/_core/executor/scheduler.py +++ b/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 -- GitLab