Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
c6d6023e
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,发现更多精彩内容 >>
未验证
提交
c6d6023e
编写于
8月 11, 2017
作者:
A
Amador Pahim
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ldoktor-fix-fail_reason2'
Signed-off-by:
N
Amador Pahim
<
apahim@redhat.com
>
上级
1262614f
9ed14b53
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
40 addition
and
24 deletion
+40
-24
avocado/core/test.py
avocado/core/test.py
+2
-2
selftests/functional/test_basic.py
selftests/functional/test_basic.py
+38
-22
未找到文件。
avocado/core/test.py
浏览文件 @
c6d6023e
...
...
@@ -714,12 +714,12 @@ class Test(unittest.TestCase):
except
exceptions
.
TestBaseException
as
detail
:
self
.
__status
=
detail
.
status
self
.
__fail_class
=
detail
.
__class__
.
__name__
self
.
__fail_reason
=
detail
self
.
__fail_reason
=
str
(
detail
)
self
.
__traceback
=
stacktrace
.
prepare_exc_info
(
sys
.
exc_info
())
except
AssertionError
as
detail
:
self
.
__status
=
'FAIL'
self
.
__fail_class
=
detail
.
__class__
.
__name__
self
.
__fail_reason
=
detail
self
.
__fail_reason
=
str
(
detail
)
self
.
__traceback
=
stacktrace
.
prepare_exc_info
(
sys
.
exc_info
())
except
Exception
as
detail
:
self
.
__status
=
'ERROR'
...
...
selftests/functional/test_basic.py
浏览文件 @
c6d6023e
...
...
@@ -29,23 +29,6 @@ basedir = os.path.abspath(basedir)
AVOCADO
=
os
.
environ
.
get
(
"UNITTEST_AVOCADO_CMD"
,
"./scripts/avocado"
)
PASS_SCRIPT_CONTENTS
=
"""#!/bin/sh
true
"""
PASS_SHELL_CONTENTS
=
"exit 0"
FAIL_SCRIPT_CONTENTS
=
"""#!/bin/sh
false
"""
FAIL_SHELL_CONTENTS
=
"exit 1"
HELLO_LIB_CONTENTS
=
"""
def hello():
return 'Hello world'
"""
LOCAL_IMPORT_TEST_CONTENTS
=
'''
from avocado import Test
from mylib import hello
...
...
@@ -114,6 +97,19 @@ class MyTest(Test):
'''
RAISE_CUSTOM_PATH_EXCEPTION_CONTENT
=
'''import os
import sys
from avocado import Test
class SharedLibTest(Test):
def test(self):
sys.path.append(os.path.join(os.path.dirname(__file__), "shared_lib"))
from mylib import CancelExc
raise CancelExc("This should not crash on unpickling in runner")
'''
def
probe_binary
(
binary
):
try
:
return
utils_path
.
find_command
(
binary
)
...
...
@@ -264,7 +260,7 @@ class RunnerOperationTest(unittest.TestCase):
def
test_runner_test_with_local_imports
(
self
):
mylib
=
script
.
TemporaryScript
(
'mylib.py'
,
HELLO_LIB_CONTENTS
,
"def hello():
\n
return 'Hello world'"
,
'avocado_simpletest_functional'
)
mylib
.
save
()
mytest
=
script
.
Script
(
...
...
@@ -396,6 +392,26 @@ class RunnerOperationTest(unittest.TestCase):
result
))
self
.
assertIn
(
'"status": "FAIL"'
,
result
.
stdout
)
def
test_exception_not_in_path
(
self
):
os
.
chdir
(
basedir
)
os
.
mkdir
(
os
.
path
.
join
(
self
.
tmpdir
,
"shared_lib"
))
mylib
=
script
.
Script
(
os
.
path
.
join
(
self
.
tmpdir
,
"shared_lib"
,
"mylib.py"
),
"from avocado import TestCancel
\n\n
"
"class CancelExc(TestCancel):
\n
"
" pass"
)
mylib
.
save
()
mytest
=
script
.
Script
(
os
.
path
.
join
(
self
.
tmpdir
,
"mytest.py"
),
RAISE_CUSTOM_PATH_EXCEPTION_CONTENT
)
mytest
.
save
()
result
=
process
.
run
(
"%s --show test run --sysinfo=off "
"--job-results-dir %s %s"
%
(
AVOCADO
,
self
.
tmpdir
,
mytest
))
self
.
assertIn
(
"mytest.py:SharedLibTest.test -> CancelExc: This "
"should not crash on unpickling in runner"
,
result
.
stdout
)
self
.
assertNotIn
(
"Failed to read queue"
,
result
.
stdout
)
def
test_runner_timeout
(
self
):
os
.
chdir
(
basedir
)
cmd_line
=
(
'%s run --sysinfo=off --job-results-dir %s '
...
...
@@ -669,11 +685,11 @@ class RunnerSimpleTest(unittest.TestCase):
self
.
tmpdir
=
tempfile
.
mkdtemp
(
prefix
=
'avocado_'
+
__name__
)
self
.
pass_script
=
script
.
TemporaryScript
(
'ʊʋʉʈɑ ʅʛʌ'
,
PASS_SCRIPT_CONTENTS
,
"#!/bin/sh
\n
true"
,
'avocado_simpletest_functional'
)
self
.
pass_script
.
save
()
self
.
fail_script
=
script
.
TemporaryScript
(
'avocado_fail.sh'
,
FAIL_SCRIPT_CONTENTS
,
"#!/bin/sh
\n
false"
,
'avocado_simpletest_'
'functional'
)
self
.
fail_script
.
save
()
...
...
@@ -833,12 +849,12 @@ class ExternalRunnerTest(unittest.TestCase):
self
.
tmpdir
=
tempfile
.
mkdtemp
(
prefix
=
'avocado_'
+
__name__
)
self
.
pass_script
=
script
.
TemporaryScript
(
'pass'
,
PASS_SHELL_CONTENTS
,
"exit 0"
,
'avocado_externalrunner_functional'
)
self
.
pass_script
.
save
()
self
.
fail_script
=
script
.
TemporaryScript
(
'fail'
,
FAIL_SHELL_CONTENTS
,
"exit 1"
,
'avocado_externalrunner_functional'
)
self
.
fail_script
.
save
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录