Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
e5e37ca1
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,发现更多精彩内容 >>
未验证
提交
e5e37ca1
编写于
6月 24, 2019
作者:
C
Cleber Rosa
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'job_category_fix_log_v2'
Signed-off-by:
N
Cleber Rosa
<
crosa@redhat.com
>
上级
9bf52629
419737c0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
5 deletion
+8
-5
avocado/core/job.py
avocado/core/job.py
+8
-5
未找到文件。
avocado/core/job.py
浏览文件 @
e5e37ca1
...
...
@@ -167,6 +167,7 @@ class Job:
self
.
_setup_job_results
()
self
.
result
=
result
.
Result
(
self
)
self
.
__start_job_logging
()
self
.
_setup_job_category
()
# Use "logdir" in case "keep_tmp" is enabled
if
getattr
(
self
.
args
,
"keep_tmp"
,
None
)
==
"on"
:
base_tmpdir
=
self
.
logdir
...
...
@@ -204,8 +205,6 @@ class Job:
id_file_obj
.
flush
()
os
.
fsync
(
id_file_obj
)
self
.
_setup_job_category
()
def
_setup_job_category
(
self
):
"""
This has to be called after self.logdir has been defined
...
...
@@ -222,8 +221,10 @@ class Job:
return
if
category
!=
astring
.
string_to_safe_path
(
category
):
LOG_JOB
.
warning
(
"Unable to set category in job results: name is not "
"filesystem safe: %s"
,
category
)
msg
=
(
"Unable to set category in job results: name is not "
"filesystem safe: %s"
%
category
)
LOG_UI
.
warning
(
msg
)
LOG_JOB
.
warning
(
msg
)
return
# we could also get "base_logdir" from args, but I believe this is
...
...
@@ -240,7 +241,9 @@ class Job:
os
.
symlink
(
os
.
path
.
relpath
(
self
.
logdir
,
category_path
),
os
.
path
.
join
(
category_path
,
os
.
path
.
basename
(
self
.
logdir
)))
except
Exception
:
LOG_JOB
.
warning
(
"Unable link this job to category %s"
,
category
)
msg
=
"Unable to link this job to category %s"
%
category
LOG_UI
.
warning
(
msg
)
LOG_JOB
.
warning
(
msg
)
def
__start_job_logging
(
self
):
# Enable test logger
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录