Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
4b3190ab
A
avocado
项目概览
openeuler
/
avocado
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
avocado
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4b3190ab
编写于
3月 15, 2018
作者:
A
Amador Pahim
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'clebergnu-python34_json_loads'
Signed-off-by:
N
Amador Pahim
<
apahim@redhat.com
>
上级
bba09590
d2b4edc3
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
24 addition
and
24 deletion
+24
-24
selftests/functional/test_basic.py
selftests/functional/test_basic.py
+11
-11
selftests/functional/test_journal.py
selftests/functional/test_journal.py
+1
-1
selftests/functional/test_json_variants.py
selftests/functional/test_json_variants.py
+1
-1
selftests/functional/test_loader.py
selftests/functional/test_loader.py
+1
-1
selftests/functional/test_output.py
selftests/functional/test_output.py
+5
-5
selftests/functional/test_output_check.py
selftests/functional/test_output_check.py
+1
-1
selftests/functional/test_skiptests.py
selftests/functional/test_skiptests.py
+3
-3
selftests/functional/test_statuses.py
selftests/functional/test_statuses.py
+1
-1
未找到文件。
selftests/functional/test_basic.py
浏览文件 @
4b3190ab
...
...
@@ -269,7 +269,7 @@ class RunnerOperationTest(unittest.TestCase):
" --json -"
%
(
AVOCADO
,
self
.
tmpdir
,
tst
),
ignore_status
=
True
)
self
.
assertEqual
(
res
.
exit_status
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
results
=
json
.
loads
(
res
.
stdout
)
results
=
json
.
loads
(
res
.
stdout
_text
)
self
.
assertEqual
(
results
[
"tests"
][
0
][
"status"
],
"ERROR"
,
"%s != %s
\n
%s"
%
(
results
[
"tests"
][
0
][
"status"
],
"ERROR"
,
res
))
...
...
@@ -288,7 +288,7 @@ class RunnerOperationTest(unittest.TestCase):
"--json - --job-timeout 1"
%
(
AVOCADO
,
self
.
tmpdir
,
tst
),
ignore_status
=
True
)
self
.
assertEqual
(
res
.
exit_status
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
results
=
json
.
loads
(
res
.
stdout
)
results
=
json
.
loads
(
res
.
stdout
_text
)
self
.
assertEqual
(
results
[
"tests"
][
0
][
"status"
],
"ERROR"
,
"%s != %s
\n
%s"
%
(
results
[
"tests"
][
0
][
"status"
],
"ERROR"
,
res
))
...
...
@@ -310,7 +310,7 @@ class RunnerOperationTest(unittest.TestCase):
"--json -"
%
(
AVOCADO
,
self
.
tmpdir
,
tst
),
ignore_status
=
True
)
self
.
assertEqual
(
res
.
exit_status
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
results
=
json
.
loads
(
res
.
stdout
)
results
=
json
.
loads
(
res
.
stdout
_text
)
self
.
assertEqual
(
results
[
"tests"
][
0
][
"status"
],
"ERROR"
,
"%s != %s
\n
%s"
%
(
results
[
"tests"
][
0
][
"status"
],
"ERROR"
,
res
))
...
...
@@ -477,7 +477,7 @@ class RunnerOperationTest(unittest.TestCase):
'passtest.py --json -'
%
(
AVOCADO
,
self
.
tmpdir
))
result
=
process
.
run
(
cmd_line
,
ignore_status
=
True
)
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_ALL_OK
)
r
=
json
.
loads
(
result
.
stdout
)
r
=
json
.
loads
(
result
.
stdout
_text
)
int
(
r
[
'job_id'
],
16
)
# it's an hex number
self
.
assertEqual
(
len
(
r
[
'job_id'
]),
40
)
...
...
@@ -505,7 +505,7 @@ class RunnerOperationTest(unittest.TestCase):
cmd
=
(
"%s run --sysinfo=off passtest.py failtest.py "
"gendata.py --json - --mux-inject foo:1 bar:2 baz:3 foo:foo:a"
" foo:bar:b foo:baz:c bar:bar:bar --dry-run"
%
AVOCADO
)
result
=
json
.
loads
(
process
.
run
(
cmd
).
stdout
)
result
=
json
.
loads
(
process
.
run
(
cmd
).
stdout
_text
)
debuglog
=
result
[
'debuglog'
]
log
=
genio
.
read_file
(
debuglog
)
# Remove the result dir
...
...
@@ -633,7 +633,7 @@ class RunnerHumanOutputTest(unittest.TestCase):
cmd
=
(
"%s run --job-results-dir %s --json - "
"cancelonsetup.py"
%
(
AVOCADO
,
self
.
tmpdir
))
result
=
process
.
run
(
cmd
)
result
=
json
.
loads
(
result
.
stdout
)
result
=
json
.
loads
(
result
.
stdout
_text
)
jobid
=
str
(
result
[
"job_id"
])
cmd
=
(
"%s run --job-results-dir %s --replay %s "
"--replay-test-status PASS"
%
(
AVOCADO
,
self
.
tmpdir
,
jobid
))
...
...
@@ -866,8 +866,8 @@ class RunnerSimpleTestStatus(unittest.TestCase):
cmd_line
=
(
'%s --config %s run --job-results-dir %s --sysinfo=off'
' %s --json -'
%
(
AVOCADO
,
self
.
config_file
.
path
,
self
.
tmpdir
,
warn_script
.
path
))
result
=
process
.
system_output
(
cmd_line
,
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
)
result
=
process
.
run
(
cmd_line
,
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout_text
)
self
.
assertEquals
(
json_results
[
'tests'
][
0
][
'status'
],
'WARN'
)
warn_script
.
remove
()
...
...
@@ -879,8 +879,8 @@ class RunnerSimpleTestStatus(unittest.TestCase):
cmd_line
=
(
'%s --config %s run --job-results-dir %s --sysinfo=off'
' %s --json -'
%
(
AVOCADO
,
self
.
config_file
.
path
,
self
.
tmpdir
,
skip_script
.
path
))
result
=
process
.
system_output
(
cmd_line
,
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
)
result
=
process
.
run
(
cmd_line
,
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout_text
)
self
.
assertEquals
(
json_results
[
'tests'
][
0
][
'status'
],
'SKIP'
)
skip_script
.
remove
()
...
...
@@ -1261,7 +1261,7 @@ class PluginsJSONTest(AbsPluginsTest, unittest.TestCase):
if
external_runner
is
not
None
:
cmd_line
+=
" --external-runner '%s'"
%
external_runner
result
=
process
.
run
(
cmd_line
,
ignore_status
=
True
)
json_output
=
result
.
stdout
json_output
=
result
.
stdout
_text
self
.
assertEqual
(
result
.
exit_status
,
e_rc
,
"Avocado did not return rc %d:
\n
%s"
%
(
e_rc
,
result
))
...
...
selftests/functional/test_journal.py
浏览文件 @
4b3190ab
...
...
@@ -23,7 +23,7 @@ class JournalPluginTests(unittest.TestCase):
'--journal examples/tests/passtest.py'
%
(
AVOCADO
,
self
.
tmpdir
))
self
.
result
=
process
.
run
(
self
.
cmd_line
,
ignore_status
=
True
)
data
=
json
.
loads
(
self
.
result
.
stdout
)
data
=
json
.
loads
(
self
.
result
.
stdout
_text
)
self
.
job_id
=
data
[
'job_id'
]
jfile
=
os
.
path
.
join
(
os
.
path
.
dirname
(
data
[
'debuglog'
]),
'.journal.sqlite'
)
self
.
db
=
sqlite3
.
connect
(
jfile
)
...
...
selftests/functional/test_json_variants.py
浏览文件 @
4b3190ab
...
...
@@ -49,7 +49,7 @@ class VariantsDumpLoadTests(unittest.TestCase):
'--job-results-dir %s --json -'
%
(
AVOCADO
,
self
.
variants_file
,
self
.
tmpdir
))
result
=
process
.
run
(
cmd_line
)
json_result
=
json
.
loads
(
result
.
stdout
)
json_result
=
json
.
loads
(
result
.
stdout
_text
)
self
.
assertEqual
(
json_result
[
"pass"
],
2
)
self
.
assertEqual
(
json_result
[
"tests"
][
0
][
"id"
],
"1-passtest.py:PassTest.test;foo-0ead"
)
...
...
selftests/functional/test_loader.py
浏览文件 @
4b3190ab
...
...
@@ -331,7 +331,7 @@ class LoaderTestFunctional(unittest.TestCase):
cmd
=
(
"%s run --sysinfo=off --job-results-dir %s --json - -- %s"
%
(
AVOCADO
,
self
.
tmpdir
,
test_path
))
result
=
process
.
run
(
cmd
,
ignore_status
=
True
)
jres
=
json
.
loads
(
result
.
stdout
)
jres
=
json
.
loads
(
result
.
stdout
_text
)
self
.
assertEqual
(
result
.
exit_status
,
1
,
result
)
exps
=
[(
"unittests.Second.test_fail"
,
"FAIL"
),
(
"unittests.Second.test_error"
,
"ERROR"
),
...
...
selftests/functional/test_output.py
浏览文件 @
4b3190ab
...
...
@@ -185,7 +185,7 @@ class OutputTest(unittest.TestCase):
test
.
save
()
result
=
process
.
run
(
"%s run --job-results-dir %s --sysinfo=off "
"--json - -- %s"
%
(
AVOCADO
,
self
.
tmpdir
,
test
))
res
=
json
.
loads
(
result
.
stdout
)
res
=
json
.
loads
(
result
.
stdout
_text
)
joblog
=
res
[
"debuglog"
]
exps
=
[
b
"[stdout] top_print"
,
b
"[stdout] top_stdout"
,
b
"[stderr] top_stderr"
,
b
"[stdout] top_process"
,
...
...
@@ -211,7 +211,7 @@ class OutputTest(unittest.TestCase):
result
=
process
.
run
(
"%s run --job-results-dir %s --sysinfo=off "
"--output-check-record=combined "
"--json - -- %s"
%
(
AVOCADO
,
self
.
tmpdir
,
test
))
res
=
json
.
loads
(
result
.
stdout
)
res
=
json
.
loads
(
result
.
stdout
_text
)
testdir
=
res
[
"tests"
][
0
][
"logdir"
]
with
open
(
os
.
path
.
join
(
testdir
,
"output"
))
as
output_file
:
self
.
assertEqual
(
"test_process__test_stderr____test_stdout__"
,
...
...
@@ -238,7 +238,7 @@ class OutputTest(unittest.TestCase):
self
.
tmpdir
,
test
.
path
)
result
=
process
.
run
(
cmd
)
res
=
json
.
loads
(
result
.
stdout
)
res
=
json
.
loads
(
result
.
stdout
_text
)
testdir
=
res
[
"tests"
][
0
][
"logdir"
]
for
output_file
in
(
'stdout'
,
'stderr'
,
'output'
):
output_file_path
=
os
.
path
.
join
(
testdir
,
output_file
)
...
...
@@ -260,7 +260,7 @@ class OutputTest(unittest.TestCase):
cmd
=
(
"%s run --job-results-dir %s --sysinfo=off "
"--json - -- %s"
)
%
(
AVOCADO
,
self
.
tmpdir
,
test
.
path
)
result
=
process
.
run
(
cmd
)
res
=
json
.
loads
(
result
.
stdout
)
res
=
json
.
loads
(
result
.
stdout
_text
)
testdir
=
res
[
"tests"
][
0
][
"logdir"
]
stdout_path
=
os
.
path
.
join
(
testdir
,
'stdout'
)
self
.
assertTrue
(
os
.
path
.
exists
(
stdout_path
))
...
...
@@ -340,7 +340,7 @@ class OutputPluginTest(unittest.TestCase):
'--journal --xunit %s --json - passtest.py'
%
(
AVOCADO
,
self
.
tmpdir
,
tmpfile
))
result
=
process
.
run
(
cmd_line
,
ignore_status
=
True
)
output
=
result
.
stdout
+
result
.
stderr
output
=
result
.
stdout
_text
+
result
.
stderr_text
expected_rc
=
exit_codes
.
AVOCADO_ALL_OK
try
:
self
.
assertEqual
(
result
.
exit_status
,
expected_rc
,
...
...
selftests/functional/test_output_check.py
浏览文件 @
4b3190ab
...
...
@@ -159,7 +159,7 @@ class RunnerSimpleTest(unittest.TestCase):
"Avocado did not return rc %d:
\n
%s"
%
(
expected_rc
,
result
))
json_result
=
json
.
loads
(
result
.
stdout
)
json_result
=
json
.
loads
(
result
.
stdout
_text
)
job_log
=
json_result
[
'debuglog'
]
stdout_diff
=
os
.
path
.
join
(
json_result
[
'tests'
][
0
][
'logdir'
],
'stdout.diff'
)
...
...
selftests/functional/test_skiptests.py
浏览文件 @
4b3190ab
...
...
@@ -115,7 +115,7 @@ class TestSkipDecorators(unittest.TestCase):
'%s'
%
self
.
test_module
,
'--json -'
]
result
=
process
.
run
(
' '
.
join
(
cmd_line
),
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout
)
json_results
=
json
.
loads
(
result
.
stdout
_text
)
debuglog
=
json_results
[
'debuglog'
]
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_ALL_OK
)
...
...
@@ -135,7 +135,7 @@ class TestSkipDecorators(unittest.TestCase):
'%s'
%
self
.
skip_setup
,
'--json -'
]
result
=
process
.
run
(
' '
.
join
(
cmd_line
),
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout
)
json_results
=
json
.
loads
(
result
.
stdout
_text
)
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_ALL_OK
)
self
.
assertEqual
(
json_results
[
'skip'
],
1
)
...
...
@@ -149,7 +149,7 @@ class TestSkipDecorators(unittest.TestCase):
'%s'
%
self
.
bad_teardown
,
'--json -'
]
result
=
process
.
run
(
' '
.
join
(
cmd_line
),
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout
)
json_results
=
json
.
loads
(
result
.
stdout
_text
)
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
self
.
assertEqual
(
json_results
[
'errors'
],
1
)
...
...
selftests/functional/test_statuses.py
浏览文件 @
4b3190ab
...
...
@@ -144,7 +144,7 @@ class TestStatuses(unittest.TestCase):
(
AVOCADO
,
test_file
,
self
.
tmpdir
))
results
=
process
.
run
(
cmd
,
ignore_status
=
True
)
self
.
results
=
json
.
loads
(
results
.
stdout
)
self
.
results
=
json
.
loads
(
results
.
stdout
_text
)
def
test
(
self
):
missing_tests
=
[]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录