Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
avocado
提交
12aebd84
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,发现更多精彩内容 >>
未验证
提交
12aebd84
编写于
8月 23, 2018
作者:
C
Cleber Rosa
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'cacarrara/enable-pylint-simple-checks'
Signed-off-by:
N
Cleber Rosa
<
crosa@redhat.com
>
上级
e9768393
b5c6c49c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
15 deletion
+19
-15
optional_plugins/varianter_yaml_to_mux/tests/test_mux.py
optional_plugins/varianter_yaml_to_mux/tests/test_mux.py
+16
-12
selftests/checkall
selftests/checkall
+1
-1
selftests/unit/test_astring.py
selftests/unit/test_astring.py
+2
-2
未找到文件。
optional_plugins/varianter_yaml_to_mux/tests/test_mux.py
浏览文件 @
12aebd84
...
...
@@ -391,26 +391,30 @@ class TestAvocadoParams(unittest.TestCase):
'ooo'
)
def
test_get_clashes
(
self
):
# py2 and py3 compatibility. assertRaisesRegex only exists in py3
if
not
hasattr
(
self
,
'assertRaisesRegex'
):
self
.
assertRaisesRegex
=
self
.
assertRaisesRegexp
# One inherited, the other is new
self
.
assertRaisesRegex
p
(
ValueError
,
r
"'clash1'.* \['/ch0/ch0.1/ch0.1.1"
r
"/ch0.1.1.1=>equal', '/ch0=>equal'\]"
,
self
.
params1
.
get
,
'clash1'
,
default
=
'nnn'
)
self
.
assertRaisesRegex
(
ValueError
,
r
"'clash1'.* \['/ch0/ch0.1/ch0.1.1"
r
"/ch0.1.1.1=>equal', '/ch0=>equal'\]"
,
self
.
params1
.
get
,
'clash1'
,
default
=
'nnn'
)
# Only inherited ones
self
.
assertEqual
(
self
.
params2
.
get
(
'clash1'
,
default
=
'ooo'
),
'equal'
)
# Booth of different origin
self
.
assertRaisesRegex
p
(
ValueError
,
r
"'clash2'.* \['/ch11=>equal', "
r
"'/ch111=>equal'\]"
,
self
.
params1
.
get
,
'clash2'
,
path
=
'/*'
)
self
.
assertRaisesRegex
(
ValueError
,
r
"'clash2'.* \['/ch11=>equal', "
r
"'/ch111=>equal'\]"
,
self
.
params1
.
get
,
'clash2'
,
path
=
'/*'
)
# Filter-out the clash
self
.
assertEqual
(
self
.
params1
.
get
(
'clash2'
,
path
=
'/ch11/*'
),
'equal'
)
# simple clash in params1
self
.
assertRaisesRegex
p
(
ValueError
,
r
"'clash3'.* \['/ch0=>also equal',"
r
" '/ch0/ch0.1b/ch0.1.2=>also equal'\]"
,
self
.
params1
.
get
,
'clash3'
,
default
=
'nnn'
)
self
.
assertRaisesRegex
(
ValueError
,
r
"'clash3'.* \['/ch0=>also equal',"
r
" '/ch0/ch0.1b/ch0.1.2=>also equal'\]"
,
self
.
params1
.
get
,
'clash3'
,
default
=
'nnn'
)
# params2 is sliced the other way around so it returns before the clash
self
.
assertEqual
(
self
.
params2
.
get
(
'clash3'
,
default
=
'nnn'
),
'also equal'
)
...
...
selftests/checkall
浏览文件 @
12aebd84
...
...
@@ -169,7 +169,7 @@ results_dir_content() {
[
"
$SKIP_RESULTSDIR_CHECK
"
]
||
RESULTS_DIR_CONTENT
=
"
$(
ls
$RESULTS_DIR
2> /dev/null
)
"
LINT_CMD
=
"inspekt lint --exclude=.git"
PYLINT_ENABLE
=
"--enable R0401,W0101,W0102,W0104,W0105,W0106,W0107,W0108,W0109,W011
0,W0111,W0120,W0122,W0123,W0124,W0125,W0150,W0404,W0611,W0612,W0622
,W1645"
PYLINT_ENABLE
=
"--enable R0401,W0101,W0102,W0104,W0105,W0106,W0107,W0108,W0109,W011
1,W0120,W0122,W0123,W0124,W0125,W0150,W0199,W0211,W0222,W0232,W0233,W0301,W0312,W0401,W0404,W0406,W0410,W0601,W0602,W0604,W0611,W0612,W0614,W0622,W0623,W0640,W0711,W1202,W1300,W1301,W1302,W1303,W1304,W1305,W1306,W1307,W1401,W1402,W1501
,W1645"
if
[
"
$AVOCADO_PARALLEL_LINT
"
]
;
then
LINT_CMD
=
"
$LINT_CMD
--parallel=
$AVOCADO_PARALLEL_LINT
"
fi
...
...
selftests/unit/test_astring.py
浏览文件 @
12aebd84
...
...
@@ -59,13 +59,13 @@ class AstringTest(unittest.TestCase):
123
),
(
u
'
\u0430\u0432\u043e\u043a\u0430\u0434\xff
'
,
123
),
(
"avok
\xc3\xa1
do"
,
123
),
(
"a
\u0430
"
,
123
)]
(
"a
\u0430
"
,
123
)]
# pylint: disable=W1402
str_matrix
=
(
"
\xd0\xb0\xd0\xb2\xd0\xbe\xd0\xba\xd0\xb0\xd0\xb4
"
"
\xef\xbf\xbd
123
\n
"
"
\xd0\xb0\xd0\xb2\xd0\xbe\xd0\xba\xd0\xb0\xd0\xb4
"
"
\xc3\xbf
123
\n
"
"avok
\xc3\xa1
do 123
\n
"
"a
\u0430
123"
)
"a
\u0430
123"
)
# pylint: disable=W1402
self
.
assertEqual
(
astring
.
tabular_output
(
matrix
),
str_matrix
)
def
test_safe_path
(
self
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录