Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
d6455cc1
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,发现更多精彩内容 >>
提交
d6455cc1
编写于
8月 14, 2017
作者:
P
Paolo Bonzini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
replace deprecated assertion methods
Signed-off-by:
N
Paolo Bonzini
<
pbonzini@redhat.com
>
上级
c95eb93f
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
11 addition
and
11 deletion
+11
-11
examples/tests/gdbtest.py
examples/tests/gdbtest.py
+2
-2
selftests/functional/test_argument_parsing.py
selftests/functional/test_argument_parsing.py
+1
-1
selftests/functional/test_basic.py
selftests/functional/test_basic.py
+3
-3
selftests/functional/test_loader.py
selftests/functional/test_loader.py
+1
-1
selftests/functional/test_skiptests.py
selftests/functional/test_skiptests.py
+3
-3
selftests/unit/test_restclient_response.py
selftests/unit/test_restclient_response.py
+1
-1
未找到文件。
examples/tests/gdbtest.py
浏览文件 @
d6455cc1
...
...
@@ -329,7 +329,7 @@ class GdbTest(Test):
"""
self
.
log
.
info
(
'Testing GDB interactivity with arguments'
)
result
=
process
.
run
(
"%s 0"
%
self
.
return99_binary_path
)
self
.
assertEqual
s
(
result
.
exit_status
,
0
)
self
.
assertEqual
(
result
.
exit_status
,
0
)
def
test_exit_status
(
self
):
"""
...
...
@@ -343,7 +343,7 @@ class GdbTest(Test):
self
.
log
.
info
(
'Expecting exit status "%s"'
,
exp
)
cmd
=
"%s %s"
%
(
self
.
return99_binary_path
,
arg
)
result
=
process
.
run
(
cmd
,
ignore_status
=
True
)
self
.
assertEqual
s
(
result
.
exit_status
,
exp
)
self
.
assertEqual
(
result
.
exit_status
,
exp
)
def
test_server_stderr
(
self
):
self
.
log
.
info
(
'Testing server stderr collection'
)
...
...
selftests/functional/test_argument_parsing.py
浏览文件 @
d6455cc1
...
...
@@ -63,7 +63,7 @@ class ArgumentParsingErrorEarlyTest(unittest.TestCase):
self
.
assertEqual
(
result
.
exit_status
,
expected_rc
,
'Avocado did not return rc %d:
\n
%s'
%
(
expected_rc
,
result
))
path_job_glob
=
os
.
path
.
join
(
log_dir
,
"job-*-%s"
%
job
[
0
:
7
])
self
.
assertEqual
s
(
glob
.
glob
(
path_job_glob
),
[])
self
.
assertEqual
(
glob
.
glob
(
path_job_glob
),
[])
def
test_whacky_option
(
self
):
self
.
run_but_fail_before_create_job_dir
(
'--whacky-option passtest'
,
...
...
selftests/functional/test_basic.py
浏览文件 @
d6455cc1
...
...
@@ -990,12 +990,12 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase):
stdout_lines
=
result
.
stdout
.
splitlines
()
self
.
assertIn
(
"Tag(s)"
,
stdout_lines
[
0
])
full_test_name
=
"%s:MyTest.test"
%
test
self
.
assertEqual
s
(
"INSTRUMENTED %s BIG_TAG_NAME"
%
full_test_name
,
self
.
assertEqual
(
"INSTRUMENTED %s BIG_TAG_NAME"
%
full_test_name
,
stdout_lines
[
1
])
self
.
assertIn
(
"TEST TYPES SUMMARY"
,
stdout_lines
)
self
.
assertIn
(
"INSTRUMENTED: 1"
,
stdout_lines
)
self
.
assertIn
(
"TEST TAGS SUMMARY"
,
stdout_lines
)
self
.
assertEqual
s
(
"BIG_TAG_NAME: 1"
,
stdout_lines
[
-
1
])
self
.
assertEqual
(
"BIG_TAG_NAME: 1"
,
stdout_lines
[
-
1
])
def
test_plugin_list
(
self
):
os
.
chdir
(
basedir
)
...
...
selftests/functional/test_loader.py
浏览文件 @
d6455cc1
...
...
@@ -173,7 +173,7 @@ class LoaderTestFunctional(unittest.TestCase):
os
.
killpg
(
os
.
getpgid
(
test_process
.
pid
),
signal
.
SIGKILL
)
self
.
fail
(
"Failed to run test under %s seconds"
%
timeout
)
time
.
sleep
(
0.05
)
self
.
assertEqual
s
(
test_process
.
returncode
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
self
.
assertEqual
(
test_process
.
returncode
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
def
test_simple
(
self
):
self
.
_test
(
'simpletest.sh'
,
SIMPLE_TEST
,
'SIMPLE'
,
self
.
MODE_0775
)
...
...
selftests/functional/test_skiptests.py
浏览文件 @
d6455cc1
...
...
@@ -118,7 +118,7 @@ class TestSkipDecorators(unittest.TestCase):
debuglog
=
json_results
[
'debuglog'
]
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_ALL_OK
)
self
.
assertEqual
s
(
json_results
[
'skip'
],
3
)
self
.
assertEqual
(
json_results
[
'skip'
],
3
)
self
.
assertFalse
(
'setup executed'
in
open
(
debuglog
,
'r'
).
read
())
self
.
assertFalse
(
'test executed'
in
open
(
debuglog
,
'r'
).
read
())
self
.
assertFalse
(
'teardown executed'
in
open
(
debuglog
,
'r'
).
read
())
...
...
@@ -135,7 +135,7 @@ class TestSkipDecorators(unittest.TestCase):
result
=
process
.
run
(
' '
.
join
(
cmd_line
),
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout
)
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_ALL_OK
)
self
.
assertEqual
s
(
json_results
[
'skip'
],
1
)
self
.
assertEqual
(
json_results
[
'skip'
],
1
)
def
test_skip_teardown
(
self
):
os
.
chdir
(
basedir
)
...
...
@@ -149,7 +149,7 @@ class TestSkipDecorators(unittest.TestCase):
result
=
process
.
run
(
' '
.
join
(
cmd_line
),
ignore_status
=
True
)
json_results
=
json
.
loads
(
result
.
stdout
)
self
.
assertEqual
(
result
.
exit_status
,
exit_codes
.
AVOCADO_TESTS_FAIL
)
self
.
assertEqual
s
(
json_results
[
'errors'
],
1
)
self
.
assertEqual
(
json_results
[
'errors'
],
1
)
def
tearDown
(
self
):
shutil
.
rmtree
(
self
.
tmpdir
)
...
...
selftests/unit/test_restclient_response.py
浏览文件 @
d6455cc1
...
...
@@ -23,7 +23,7 @@ class ResultResponseTest(unittest.TestCase):
def
test_good_data
(
self
):
r
=
response
.
ResultResponse
(
self
.
GOOD_DATA
)
self
.
assertEqual
s
(
r
.
count
,
1
)
self
.
assertEqual
(
r
.
count
,
1
)
def
test_bad_data_json
(
self
):
self
.
assertRaises
(
response
.
InvalidJSONError
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录