External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove unnecessary ret variables and cleanup labels

Browse Source 
Several functions were simplified to remove the only cleanup code at
the cleanup label, making it unnecessary.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2021-11-14 20:05:32 -05:00
parent 35eb484f8c
commit f8151c637c
1 changed files with 31 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
tests/virfirewalltest.c
View File

@ -64,7 +64,6 @@ testFirewallSingleGroup(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -87,19 +86,17 @@ testFirewallSingleGroup(const void *opaque G_GNUC_UNUSED)
"--jump", "REJECT", NULL); "--jump", "REJECT", NULL);
if (virFirewallApply(fw) < 0) if (virFirewallApply(fw) < 0)
goto cleanup; return -1;
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -108,7 +105,6 @@ testFirewallRemoveRule(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -137,19 +133,17 @@ testFirewallRemoveRule(const void *opaque G_GNUC_UNUSED)
virFirewallRuleAddArgList(fw, fwrule, "--jump", "REJECT", NULL); virFirewallRuleAddArgList(fw, fwrule, "--jump", "REJECT", NULL);
if (virFirewallApply(fw) < 0) if (virFirewallApply(fw) < 0)
goto cleanup; return -1;
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -158,7 +152,6 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -194,19 +187,17 @@ testFirewallManyGroups(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) < 0) if (virFirewallApply(fw) < 0)
goto cleanup; return -1;
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
static void static void
@ -236,7 +227,6 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -272,19 +262,17 @@ testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) < 0) if (virFirewallApply(fw) < 0)
goto cleanup; return -1;
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -293,7 +281,6 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -328,19 +315,17 @@ testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) < 0) if (virFirewallApply(fw) < 0)
goto cleanup; return -1;
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -349,7 +334,6 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -377,7 +361,7 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) == 0) { if (virFirewallApply(fw) == 0) {
fprintf(stderr, "Firewall apply unexpectedly worked\n"); fprintf(stderr, "Firewall apply unexpectedly worked\n");
goto cleanup; return -1;
} }
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
@ -385,12 +369,10 @@ testFirewallNoRollback(const void *opaque G_GNUC_UNUSED)
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
static int static int
@ -398,7 +380,6 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -446,7 +427,7 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) == 0) { if (virFirewallApply(fw) == 0) {
fprintf(stderr, "Firewall apply unexpectedly worked\n"); fprintf(stderr, "Firewall apply unexpectedly worked\n");
goto cleanup; return -1;
} }
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
@ -454,12 +435,10 @@ testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED)
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
static int static int
@ -467,7 +446,6 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -518,7 +496,7 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) == 0) { if (virFirewallApply(fw) == 0) {
fprintf(stderr, "Firewall apply unexpectedly worked\n"); fprintf(stderr, "Firewall apply unexpectedly worked\n");
goto cleanup; return -1;
} }
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
@ -526,12 +504,10 @@ testFirewallManyRollback(const void *opaque G_GNUC_UNUSED)
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
static int static int
@ -539,7 +515,6 @@ testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -620,7 +595,7 @@ testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED)
if (virFirewallApply(fw) == 0) { if (virFirewallApply(fw) == 0) {
fprintf(stderr, "Firewall apply unexpectedly worked\n"); fprintf(stderr, "Firewall apply unexpectedly worked\n");
goto cleanup; return -1;
} }
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
@ -628,12 +603,10 @@ testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED)
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }
@ -720,7 +693,6 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED)
{ {
g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cmdbuf = VIR_BUFFER_INITIALIZER;
g_autoptr(virFirewall) fw = virFirewallNew(); g_autoptr(virFirewall) fw = virFirewallNew();
int ret = -1;
const char *actual = NULL; const char *actual = NULL;
const char *expected = const char *expected =
IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n" IPTABLES " -w -A INPUT --source 192.168.122.1 --jump ACCEPT\n"
@ -783,24 +755,22 @@ testFirewallQuery(const void *opaque G_GNUC_UNUSED)
"--jump", "REJECT", NULL); "--jump", "REJECT", NULL);
if (virFirewallApply(fw) < 0) if (virFirewallApply(fw) < 0)
goto cleanup; return -1;
actual = virBufferCurrentContent(&cmdbuf); actual = virBufferCurrentContent(&cmdbuf);
if (expectedLineError) { if (expectedLineError) {
fprintf(stderr, "Got some unexpected query data\n"); fprintf(stderr, "Got some unexpected query data\n");
goto cleanup; return -1;
} }
if (STRNEQ_NULLABLE(expected, actual)) { if (STRNEQ_NULLABLE(expected, actual)) {
fprintf(stderr, "Unexpected command execution\n"); fprintf(stderr, "Unexpected command execution\n");
virTestDifference(stderr, expected, actual); virTestDifference(stderr, expected, actual);
goto cleanup; return -1;
} }
ret = 0; return 0;
cleanup:
return ret;
} }