Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Test Xdevice
提交
f6bec771
T
Test Xdevice
项目概览
OpenHarmony
/
Test Xdevice
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
f6bec771
编写于
8月 02, 2021
作者:
O
openharmony_ci
提交者:
Gitee
8月 02, 2021
浏览文件
操作
浏览文件
下载
差异文件
!26 支持TDD用例驱动指定
Merge pull request !26 from alex_hold/master
上级
f6a0539d
fa5127b9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
9 deletion
+24
-9
src/xdevice/_core/executor/scheduler.py
src/xdevice/_core/executor/scheduler.py
+3
-0
src/xdevice/_core/executor/source.py
src/xdevice/_core/executor/source.py
+21
-9
未找到文件。
src/xdevice/_core/executor/scheduler.py
浏览文件 @
f6bec771
...
@@ -61,6 +61,7 @@ from _core.executor.concurrent import QueueMonitorThread
...
@@ -61,6 +61,7 @@ from _core.executor.concurrent import QueueMonitorThread
from
_core.executor.source
import
TestSetSource
from
_core.executor.source
import
TestSetSource
from
_core.executor.source
import
find_test_descriptors
from
_core.executor.source
import
find_test_descriptors
from
_core.executor.source
import
find_testdict_descriptors
from
_core.executor.source
import
find_testdict_descriptors
from
_core.executor.source
import
TestDictSource
from
_core.logger
import
platform_logger
from
_core.logger
import
platform_logger
from
_core.logger
import
add_task_file_handler
from
_core.logger
import
add_task_file_handler
from
_core.logger
import
remove_task_file_handler
from
_core.logger
import
remove_task_file_handler
...
@@ -99,6 +100,7 @@ class Scheduler(object):
...
@@ -99,6 +100,7 @@ class Scheduler(object):
task
=
Task
(
drivers
=
[])
task
=
Task
(
drivers
=
[])
task
.
init
(
config
)
task
.
init
(
config
)
TestDictSource
.
reset
()
root_descriptor
=
self
.
_find_test_root_descriptor
(
task
.
config
)
root_descriptor
=
self
.
_find_test_root_descriptor
(
task
.
config
)
task
.
set_root_descriptor
(
root_descriptor
)
task
.
set_root_descriptor
(
root_descriptor
)
return
task
return
task
...
@@ -150,6 +152,7 @@ class Scheduler(object):
...
@@ -150,6 +152,7 @@ class Scheduler(object):
LOG
.
exception
(
exception
,
exc_info
=
False
,
error_no
=
error_no
)
LOG
.
exception
(
exception
,
exc_info
=
False
,
error_no
=
error_no
)
finally
:
finally
:
Scheduler
.
_clear_test_dict_source
()
if
getattr
(
task
.
config
,
ConfigConst
.
test_environment
,
""
)
or
\
if
getattr
(
task
.
config
,
ConfigConst
.
test_environment
,
""
)
or
\
getattr
(
task
.
config
,
ConfigConst
.
configfile
,
""
):
getattr
(
task
.
config
,
ConfigConst
.
configfile
,
""
):
self
.
_restore_environment
()
self
.
_restore_environment
()
...
...
src/xdevice/_core/executor/source.py
浏览文件 @
f6bec771
...
@@ -17,6 +17,8 @@
...
@@ -17,6 +17,8 @@
#
#
import
os
import
os
import
json
import
copy
from
collections
import
namedtuple
from
collections
import
namedtuple
from
_core.constants
import
DeviceTestType
from
_core.constants
import
DeviceTestType
...
@@ -30,7 +32,7 @@ from _core.utils import unique_id
...
@@ -30,7 +32,7 @@ from _core.utils import unique_id
__all__
=
[
"TestSetSource"
,
"TestSource"
,
"find_test_descriptors"
,
__all__
=
[
"TestSetSource"
,
"TestSource"
,
"find_test_descriptors"
,
"find_testdict_descriptors"
]
"find_testdict_descriptors"
,
"TestDictSource"
]
TestSetSource
=
namedtuple
(
'TestSetSource'
,
'set'
)
TestSetSource
=
namedtuple
(
'TestSetSource'
,
'set'
)
TestSource
=
namedtuple
(
'TestSource'
,
'source_file source_string config_file '
TestSource
=
namedtuple
(
'TestSource'
,
'source_file source_string config_file '
...
@@ -51,6 +53,7 @@ EXT_TYPE_DICT = {".dex": DeviceTestType.dex_test,
...
@@ -51,6 +53,7 @@ EXT_TYPE_DICT = {".dex": DeviceTestType.dex_test,
PY_SUFFIX
=
".py"
PY_SUFFIX
=
".py"
PYD_SUFFIX
=
".pyd"
PYD_SUFFIX
=
".pyd"
MODULE_CONFIG_SUFFIX
=
".json"
MODULE_CONFIG_SUFFIX
=
".json"
MAX_DIR_DEPTH
=
6
LOG
=
platform_logger
(
"TestSource"
)
LOG
=
platform_logger
(
"TestSource"
)
...
@@ -116,8 +119,8 @@ def find_testdict_descriptors(config):
...
@@ -116,8 +119,8 @@ def find_testdict_descriptors(config):
for
file_name
in
files
:
for
file_name
in
files
:
if
not
os
.
path
.
isabs
(
file_name
):
if
not
os
.
path
.
isabs
(
file_name
):
file_name
=
os
.
path
.
join
(
Variables
.
exec_dir
,
file_name
)
file_name
=
os
.
path
.
join
(
Variables
.
exec_dir
,
file_name
)
if
os
.
path
.
isfile
(
if
os
.
path
.
isfile
(
file_name
)
and
test_type_key
in
\
file_name
)
and
test_type_key
in
TEST_TYPE_DICT
.
keys
():
TestDictSource
.
test_type
.
keys
():
desc
=
_make_test_descriptor
(
os
.
path
.
abspath
(
file_name
),
desc
=
_make_test_descriptor
(
os
.
path
.
abspath
(
file_name
),
test_type_key
)
test_type_key
)
if
desc
is
not
None
:
if
desc
is
not
None
:
...
@@ -248,7 +251,7 @@ def _make_test_descriptor(file_path, test_type_key):
...
@@ -248,7 +251,7 @@ def _make_test_descriptor(file_path, test_type_key):
# get params
# get params
filename
,
_
=
get_filename_extension
(
file_path
)
filename
,
_
=
get_filename_extension
(
file_path
)
uid
=
unique_id
(
"TestSource"
,
filename
)
uid
=
unique_id
(
"TestSource"
,
filename
)
test_type
=
T
EST_TYPE_DICT
[
test_type_key
]
test_type
=
T
estDictSource
.
test_type
[
test_type_key
]
config_file
=
_get_config_file
(
config_file
=
_get_config_file
(
os
.
path
.
join
(
os
.
path
.
dirname
(
file_path
),
filename
))
os
.
path
.
join
(
os
.
path
.
dirname
(
file_path
),
filename
))
...
@@ -358,7 +361,7 @@ def _get_config_file(filename, ext=None, config=None):
...
@@ -358,7 +361,7 @@ def _get_config_file(filename, ext=None, config=None):
def
_get_testcase_config_file
(
filename
):
def
_get_testcase_config_file
(
filename
):
depth
=
1
depth
=
1
dirname
=
os
.
path
.
dirname
(
filename
)
dirname
=
os
.
path
.
dirname
(
filename
)
while
dirname
and
depth
<
6
:
while
dirname
and
depth
<
MAX_DIR_DEPTH
:
for
item
in
os
.
listdir
(
dirname
):
for
item
in
os
.
listdir
(
dirname
):
item_path
=
os
.
path
.
join
(
dirname
,
item
)
item_path
=
os
.
path
.
join
(
dirname
,
item
)
if
os
.
path
.
isfile
(
item_path
)
and
item
.
endswith
(
if
os
.
path
.
isfile
(
item_path
)
and
item
.
endswith
(
...
@@ -379,11 +382,10 @@ def _get_test_type(config_file, test_driver, ext):
...
@@ -379,11 +382,10 @@ def _get_test_type(config_file, test_driver, ext):
error_no
=
"00110"
)
error_no
=
"00110"
)
return
""
return
""
return
_get_test_driver
(
config_file
)
return
_get_test_driver
(
config_file
)
if
ext
in
[
".py"
,
".js"
,
".dex"
,
".hap"
,
".bin"
]
\
if
ext
in
[
".py"
,
".js"
,
".dex"
,
".hap"
,
".bin"
]
\
and
ext
in
EXT_TYPE_DICT
.
keys
():
and
ext
in
TestDictSource
.
exe_type
.
keys
():
test_type
=
EXT_TYPE_DICT
[
ext
]
test_type
=
TestDictSource
.
exe_type
[
ext
]
elif
ext
in
EXT_TYPE_DICT
.
keys
():
elif
ext
in
TestDictSource
.
exe_type
.
keys
():
test_type
=
DeviceTestType
.
hap_test
test_type
=
DeviceTestType
.
hap_test
else
:
else
:
test_type
=
DeviceTestType
.
cpp_test
test_type
=
DeviceTestType
.
cpp_test
...
@@ -397,3 +399,13 @@ def _parse_module_name(config_file, file_name):
...
@@ -397,3 +399,13 @@ def _parse_module_name(config_file, file_name):
if
"{"
in
file_name
:
if
"{"
in
file_name
:
return
"report"
return
"report"
return
file_name
return
file_name
class
TestDictSource
:
exe_type
=
dict
()
test_type
=
dict
()
@
classmethod
def
reset
(
cls
):
cls
.
test_type
=
copy
.
deepcopy
(
TEST_TYPE_DICT
)
cls
.
exe_type
=
copy
.
deepcopy
(
EXT_TYPE_DICT
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录