Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Test Xdevice
提交
0ec20a46
T
Test Xdevice
项目概览
OpenHarmony
/
Test Xdevice
9 个月 前同步成功
通知
6
Star
23
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Test Xdevice
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0ec20a46
编写于
8月 15, 2022
作者:
D
deveco_test
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix code reivewbot bug
Signed-off-by:
N
deveco_test
<
liguangjie1@huawei.com
>
上级
13ef40e6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
10 addition
and
17 deletion
+10
-17
plugins/ohos/src/ohos/drivers/drivers.py
plugins/ohos/src/ohos/drivers/drivers.py
+3
-5
plugins/ohos/src/ohos/environment/device.py
plugins/ohos/src/ohos/environment/device.py
+2
-6
src/xdevice/_core/executor/concurrent.py
src/xdevice/_core/executor/concurrent.py
+5
-6
未找到文件。
plugins/ohos/src/ohos/drivers/drivers.py
浏览文件 @
0ec20a46
...
...
@@ -1768,9 +1768,8 @@ class DexTestDriver(IDriver):
if
not
getattr
(
"exception"
,
"error_no"
,
""
):
setattr
(
exception
,
"error_no"
,
"03203"
)
return_message
=
str
(
exception
.
args
)
finally
:
shutil
.
rmtree
(
long_command_path
)
return
return_message
shutil
.
rmtree
(
long_command_path
)
return
return_message
@
staticmethod
def
_make_long_command_file
(
command
,
longcommand_path
,
filename
):
...
...
@@ -1785,8 +1784,7 @@ class DexTestDriver(IDriver):
except
(
IOError
,
ValueError
)
as
err_msg
:
LOG
.
exception
(
"Error for make long command file: "
,
err_msg
,
exc_info
=
False
,
error_no
=
"03200"
)
finally
:
return
sh_file_name
,
file_path
return
sh_file_name
,
file_path
def
__result__
(
self
):
return
self
.
result
if
os
.
path
.
exists
(
self
.
result
)
else
""
...
...
plugins/ohos/src/ohos/environment/device.py
浏览文件 @
0ec20a46
...
...
@@ -602,8 +602,7 @@ class Device(IDevice):
self
.
_proxy
=
OpenHarmony
(
port
=
self
.
_h_port
,
addr
=
self
.
host
,
device
=
self
)
except
Exception
as
error
:
self
.
log
.
error
(
' proxy init error: {}.'
.
format
(
str
(
error
)))
finally
:
return
self
.
_proxy
return
self
.
_proxy
def
start_harmony_rpc
(
self
,
port
=
8080
,
re_install_rpc
=
False
):
from
devicetest.core.error_message
import
ErrorMessage
...
...
@@ -706,8 +705,6 @@ class Device(IDevice):
return
ret
except
Exception
as
err
:
self
.
log
.
error
(
'DeviceTest-20013 uninstall: %s'
%
str
(
err
))
finally
:
return
False
def
reconnect
(
self
,
waittime
=
60
):
'''
...
...
@@ -792,8 +789,7 @@ class Device(IDevice):
self
.
pull_file
(
"/data/screen.png"
,
path
)
except
Exception
as
error
:
self
.
log
.
error
(
"devicetest take_picture: {}"
.
format
(
str
(
error
)))
finally
:
return
path
return
path
def
set_device_report_path
(
self
,
path
):
self
.
_device_log_path
=
path
\ No newline at end of file
src/xdevice/_core/executor/concurrent.py
浏览文件 @
0ec20a46
...
...
@@ -273,12 +273,11 @@ class DriversThread(threading.Thread):
failed_list
=
params
[
ReportConst
.
unsuccessful_params
].
get
(
module_name
,
[])
except
Exception
:
failed_list
=
params
[
ReportConst
.
unsuccessful_params
].
get
(
module_name
,
[])
finally
:
if
not
failed_list
:
failed_list
=
params
[
ReportConst
.
unsuccessful_params
].
get
(
str
(
module_name
).
split
(
"."
)[
0
],
[])
unpassed_test_params
.
extend
(
failed_list
)
LOG
.
debug
(
"Get unpassed test params %s"
,
unpassed_test_params
)
return
unpassed_test_params
if
not
failed_list
:
failed_list
=
params
[
ReportConst
.
unsuccessful_params
].
get
(
str
(
module_name
).
split
(
"."
)[
0
],
[])
unpassed_test_params
.
extend
(
failed_list
)
LOG
.
debug
(
"Get unpassed test params %s"
,
unpassed_test_params
)
return
unpassed_test_params
@
classmethod
def
_append_unpassed_test_param
(
cls
,
history_report_file
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录