Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
ab7e951f
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,发现更多精彩内容 >>
提交
ab7e951f
编写于
8月 24, 2016
作者:
A
Amador Pahim
提交者:
GitHub
8月 24, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1416 from ldoktor/root-crash
avocado: Remote and html bugfixes
上级
ee996eb9
5a32a97a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
4 addition
and
4 deletion
+4
-4
avocado/core/html.py
avocado/core/html.py
+3
-3
avocado/core/remote/runner.py
avocado/core/remote/runner.py
+1
-1
未找到文件。
avocado/core/html.py
浏览文件 @
ab7e951f
...
@@ -182,9 +182,9 @@ class ReportModel(object):
...
@@ -182,9 +182,9 @@ class ReportModel(object):
sysinfo_dict
[
'contents'
]
=
sysinfo_file
.
read
()
sysinfo_dict
[
'contents'
]
=
sysinfo_file
.
read
()
sysinfo_dict
[
'element_id'
]
=
'%s_heading_%s'
%
(
phase
,
s_id
)
sysinfo_dict
[
'element_id'
]
=
'%s_heading_%s'
%
(
phase
,
s_id
)
sysinfo_dict
[
'collapse_id'
]
=
'%s_collapse_%s'
%
(
phase
,
s_id
)
sysinfo_dict
[
'collapse_id'
]
=
'%s_collapse_%s'
%
(
phase
,
s_id
)
except
OSError
:
except
(
OSError
,
UnicodeDecodeError
)
as
details
:
sysinfo_dict
[
s_f
]
=
(
'Error reading sysinfo file %s'
%
sysinfo_dict
[
s_f
]
=
(
'Error reading sysinfo file %s
: %s
'
%
sysinfo_path
)
(
sysinfo_path
,
details
)
)
sysinfo_list
.
append
(
sysinfo_dict
)
sysinfo_list
.
append
(
sysinfo_dict
)
s_id
+=
1
s_id
+=
1
return
sysinfo_list
return
sysinfo_list
...
...
avocado/core/remote/runner.py
浏览文件 @
ab7e951f
...
@@ -42,7 +42,7 @@ class RemoteTestRunner(TestRunner):
...
@@ -42,7 +42,7 @@ class RemoteTestRunner(TestRunner):
# Let's use re.MULTILINE because sometimes servers might have MOTD
# Let's use re.MULTILINE because sometimes servers might have MOTD
# that will introduce a line break on output.
# that will introduce a line break on output.
remote_version_re
=
re
.
compile
(
r
'^Avocado (\d+)\.(\d+)$'
,
remote_version_re
=
re
.
compile
(
r
'^Avocado (\d+)\.(\d+)
\r?
$'
,
re
.
MULTILINE
)
re
.
MULTILINE
)
def
__init__
(
self
,
job
,
test_result
):
def
__init__
(
self
,
job
,
test_result
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录