Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
3f9bb7c6
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,发现更多精彩内容 >>
未验证
提交
3f9bb7c6
编写于
2月 13, 2018
作者:
A
Amador Pahim
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'clebergnu-selftests_and_misc_fixes_3rd_batch'
Signed-off-by:
N
Amador Pahim
<
apahim@redhat.com
>
上级
65e7f84e
d39729ec
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
10 deletion
+17
-10
avocado/core/sysinfo.py
avocado/core/sysinfo.py
+2
-2
selftests/functional/test_output.py
selftests/functional/test_output.py
+4
-4
selftests/functional/test_standalone.py
selftests/functional/test_standalone.py
+10
-3
selftests/functional/test_utils.py
selftests/functional/test_utils.py
+1
-1
未找到文件。
avocado/core/sysinfo.py
浏览文件 @
3f9bb7c6
...
...
@@ -170,10 +170,10 @@ class Command(Collectible):
env
=
env
)
logf_path
=
os
.
path
.
join
(
logdir
,
self
.
logf
)
if
self
.
_compress_log
:
with
gzip
.
GzipFile
(
logf_path
,
'w'
)
as
logf
:
with
gzip
.
GzipFile
(
logf_path
,
'w
b
'
)
as
logf
:
logf
.
write
(
result
.
stdout
)
else
:
with
open
(
logf_path
,
'w'
)
as
logf
:
with
open
(
logf_path
,
'w
b
'
)
as
logf
:
logf
.
write
(
result
.
stdout
)
...
...
selftests/functional/test_output.py
浏览文件 @
3f9bb7c6
...
...
@@ -41,7 +41,7 @@ import sys
from avocado import Test
from avocado.utils import process
print
"top_print"
print
("top_print")
sys.stdout.write("top_stdout
\\
n")
sys.stderr.write("top_stderr
\\
n")
process.run("/bin/echo top_process")
...
...
@@ -49,13 +49,13 @@ process.run("/bin/echo top_process")
class OutputTest(Test):
def __init__(self, *args, **kwargs):
super(OutputTest, self).__init__(*args, **kwargs)
print
"init_print"
print
("init_print")
sys.stdout.write("init_stdout
\\
n")
sys.stderr.write("init_stderr
\\
n")
process.run("/bin/echo init_process")
def test(self):
print
"test_print"
print
("test_print")
sys.stdout.write("test_stdout
\\
n")
sys.stderr.write("test_stderr
\\
n")
process.run("/bin/echo -n test_process > /dev/stdout",
...
...
@@ -66,7 +66,7 @@ class OutputTest(Test):
shell=True)
def __del__(self):
print
"del_print"
print
("del_print")
sys.stdout.write("del_stdout
\\
n")
sys.stderr.write("del_stderr
\\
n")
process.run("/bin/echo -n del_process")
...
...
selftests/functional/test_standalone.py
浏览文件 @
3f9bb7c6
import
os
import
sys
import
unittest
from
avocado.core
import
exit_codes
...
...
@@ -45,7 +46,10 @@ class StandaloneTests(unittest.TestCase):
cmd_line
=
'./examples/tests/errortest_nasty.py -r'
expected_rc
=
exit_codes
.
AVOCADO_TESTS_FAIL
result
=
self
.
run_and_check
(
cmd_line
,
expected_rc
,
'errortest_nasty'
)
exc
=
"NastyException: Nasty-string-like-exception"
if
sys
.
version_info
[
0
]
==
3
:
exc
=
"errortest_nasty.NastyException: Nasty-string-like-exception"
else
:
exc
=
"NastyException: Nasty-string-like-exception"
count
=
result
.
stdout
.
count
(
"
\n
%s"
%
exc
)
self
.
assertEqual
(
count
,
2
,
"Exception
\\
n%s should be present twice in"
"the log (once from the log, second time when parsing"
...
...
@@ -62,8 +66,11 @@ class StandaloneTests(unittest.TestCase):
cmd_line
=
'./examples/tests/errortest_nasty3.py -r'
expected_rc
=
exit_codes
.
AVOCADO_TESTS_FAIL
result
=
self
.
run_and_check
(
cmd_line
,
expected_rc
,
'errortest_nasty3'
)
self
.
assertIn
(
"TestError: <errortest_nasty3.NastyException instance at "
,
result
.
stdout
)
if
sys
.
version_info
[
0
]
==
3
:
exc
=
"TypeError: exceptions must derive from BaseException"
else
:
exc
=
"TestError: <errortest_nasty3.NastyException instance at "
self
.
assertIn
(
exc
,
result
.
stdout
)
def
test_errortest
(
self
):
cmd_line
=
'./examples/tests/errortest.py -r'
...
...
selftests/functional/test_utils.py
浏览文件 @
3f9bb7c6
...
...
@@ -144,7 +144,7 @@ class ProcessTest(unittest.TestCase):
time
.
sleep
(
3
)
proc
.
terminate
()
proc
.
wait
()
stdout
=
proc
.
get_stdout
()
stdout
=
proc
.
get_stdout
()
.
decode
()
self
.
assertIn
(
'memory'
,
stdout
,
'result: %s'
%
stdout
)
self
.
assertRegexpMatches
(
stdout
,
'[0-9]+'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录