From 49c505a2e07587b6b1a5bca255cfac0fb910b320 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 31 Mar 2021 10:46:36 +0200 Subject: [PATCH] networkxml2firewalltest: Use internal wrapping of command line arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit virCommandSetDryRun allows to invoke virCommandToString so that the command string is already wrapped. We now also need to load the base arguments file without unwrapping the arguments. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Pavel Hrdina --- tests/networkxml2firewalltest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 16249c49fd..60cd79eeb2 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -98,7 +98,7 @@ static int testCompareXMLToArgvFiles(const char *xml, char *actual; g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew(); - virCommandSetDryRun(dryRunToken, &buf, false, true, testCommandDryRun, NULL); + virCommandSetDryRun(dryRunToken, &buf, true, true, testCommandDryRun, NULL); if (!(def = virNetworkDefParseFile(xml, NULL))) goto cleanup; @@ -115,7 +115,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (STRPREFIX(actual, baseargs)) actual += strlen(baseargs); - if (virTestCompareToFile(actual, cmdline) < 0) + if (virTestCompareToFileFull(actual, cmdline, false) < 0) goto cleanup; ret = 0; @@ -189,7 +189,7 @@ mymain(void) basefile = g_strdup_printf("%s/networkxml2firewalldata/base.args", abs_srcdir); - if (virTestLoadFile(basefile, &baseargs) < 0) + if (virFileReadAll(basefile, INT_MAX, &baseargs) < 0) return EXIT_FAILURE; DO_TEST("nat-default");