Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
8a9bd034
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8a9bd034
编写于
5月 26, 2016
作者:
T
Tomáš Ryšavý
提交者:
John Ferlan
6月 08, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tests: Rename virtTestClearCommandPath to virTestClearCommandPath.
This function doesn't follow our convention of naming functions.
上级
753edcb3
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
11 deletion
+11
-11
tests/networkxml2firewalltest.c
tests/networkxml2firewalltest.c
+1
-1
tests/nwfilterebiptablestest.c
tests/nwfilterebiptablestest.c
+7
-7
tests/nwfilterxml2firewalltest.c
tests/nwfilterxml2firewalltest.c
+1
-1
tests/testutils.c
tests/testutils.c
+1
-1
tests/testutils.h
tests/testutils.h
+1
-1
未找到文件。
tests/networkxml2firewalltest.c
浏览文件 @
8a9bd034
...
...
@@ -65,7 +65,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto
cleanup
;
actualargv
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actualargv
);
virTestClearCommandPath
(
actualargv
);
virCommandSetDryRun
(
NULL
,
NULL
,
NULL
);
if
(
virTestCompareToFile
(
actualargv
,
cmdline
)
<
0
)
...
...
tests/nwfilterebiptablestest.c
浏览文件 @
8a9bd034
...
...
@@ -113,7 +113,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
@@ -184,7 +184,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
@@ -233,7 +233,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
@@ -267,7 +267,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
@@ -339,7 +339,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
@@ -429,7 +429,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
@@ -502,7 +502,7 @@ testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSED)
goto
cleanup
;
actual
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actual
);
virTestClearCommandPath
(
actual
);
if
(
STRNEQ_NULLABLE
(
actual
,
expected
))
{
virTestDifference
(
stderr
,
expected
,
actual
);
...
...
tests/nwfilterxml2firewalltest.c
浏览文件 @
8a9bd034
...
...
@@ -400,7 +400,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto
cleanup
;
actualargv
=
virBufferContentAndReset
(
&
buf
);
vir
t
TestClearCommandPath
(
actualargv
);
virTestClearCommandPath
(
actualargv
);
virCommandSetDryRun
(
NULL
,
NULL
,
NULL
);
testRemoveCommonRules
(
actualargv
);
...
...
tests/testutils.c
浏览文件 @
8a9bd034
...
...
@@ -1008,7 +1008,7 @@ int virtTestMain(int argc,
* iptables --table filter --insert FORWARD --out-interface virbr0 --jump REJECT
* iptables --table filter --insert FORWARD --in-interface virbr0 --out-interface virbr0 --jump ACCEPT"
*/
void
vir
t
TestClearCommandPath
(
char
*
cmdset
)
void
virTestClearCommandPath
(
char
*
cmdset
)
{
size_t
offset
=
0
;
char
*
lineStart
=
cmdset
;
...
...
tests/testutils.h
浏览文件 @
8a9bd034
...
...
@@ -54,7 +54,7 @@ int virTestRun(const char *title,
int
virTestLoadFile
(
const
char
*
file
,
char
**
buf
);
int
virtTestCaptureProgramOutput
(
const
char
*
const
argv
[],
char
**
buf
,
int
maxlen
);
void
vir
t
TestClearCommandPath
(
char
*
cmdset
);
void
virTestClearCommandPath
(
char
*
cmdset
);
int
virTestDifference
(
FILE
*
stream
,
const
char
*
expect
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录