openharmony/testfwk_xdevice
1
0
Fork 0
mirror of https://gitee.com/openharmony/testfwk_xdevice synced 2024-11-30 11:00:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!192 fix tdd error

Browse Source 
Merge pull request !192 from liguangjie/master
This commit is contained in:
openharmony_ci 2022-11-22 08:50:00 +00:00 committed by Gitee
commit 14da4e500a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/ohos/src/ohos/drivers/drivers.py
View File

@ -2323,7 +2323,8 @@ class JSUnitTestDriver(IDriver):
serial = "{}_{}".format(str(self.config.device.__get_serial__()), time.time_ns())
log_tar_file_name = "{}_{}".format(request.get_module_name(),
str(serial).replace(":", "_"))
if self.config.device_log == ConfigConst.device_log_on:
if hasattr(self.config, "device_log") and \
self.config.device_log == ConfigConst.device_log_on:
self.config.device.start_get_crash_log(log_tar_file_name)
self.config.device.stop_catch_device_log()
self.result = check_result_report(
@ -2356,7 +2357,8 @@ class JSUnitTestDriver(IDriver):
0o755)
with os.fdopen(hilog_open, "a") as hilog_file_pipe:
if self.config.device_log == ConfigConst.device_log_on:
if hasattr(self.config, "device_log") and \
self.config.device_log == ConfigConst.device_log_on:
self.config.device.clear_crash_log()
self.config.device.start_catch_device_log(
hilog_file_pipe=hilog_file_pipe)

6
plugins/ohos/src/ohos/drivers/openharmony.py
View File

@ -251,7 +251,8 @@ class OHJSUnitTestDriver(IDriver):
0o755)
self.config.device.execute_shell_command(command="hilog -r")
with os.fdopen(hilog_open, "a") as hilog_file_pipe:
if self.config.device_log == ConfigConst.device_log_on \
if hasattr(self.config, "device_log") \
and self.config.device_log == ConfigConst.device_log_on \
and hasattr(self.config.device, "clear_crash_log"):
self.config.device.clear_crash_log()
self.config.device.start_catch_device_log(hilog_file_pipe=hilog_file_pipe)
@ -266,7 +267,8 @@ class OHJSUnitTestDriver(IDriver):
serial = "{}_{}".format(str(self.config.device.__get_serial__()), time.time_ns())
log_tar_file_name = "{}_{}".format(request.get_module_name(),
str(serial).replace(":", "_"))
if self.config.device_log == ConfigConst.device_log_on \
if hasattr(self.config, "device_log") and \
self.config.device_log == ConfigConst.device_log_on \
and hasattr(self.config.device, "start_get_crash_log"):
self.config.device.start_get_crash_log(log_tar_file_name)
self.config.device.stop_catch_device_log()