[PATCH 6/9] networkxml2conftest: s/lo/lo0/ on non-Linux

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



After 478ddedc12 a bug is fixed where we wrongly presumed loopack
device name on non-Linux systems. It's lo0. However, the fix is
not reflected in the tests which are failing now.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 tests/networkxml2conftest.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index a80d3b2d4..404e2c722 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -41,10 +41,21 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr
     if (dctx == NULL)
         goto fail;
 
-    if (networkDnsmasqConfContents(obj, pidfile, &actual,
-                        dctx, caps) < 0)
+    if (networkDnsmasqConfContents(obj, pidfile, &actual, dctx, caps) < 0)
         goto fail;
 
+#ifndef __linux__
+    char * tmp;
+
+    if (!(tmp = virStringReplace(actual,
+                                 "except-interface=lo0\n",
+                                 "except-interface=lo\n")))
+        goto fail;
+    VIR_FREE(actual);
+    actual = tmp;
+    tmp = NULL;
+#endif
+
     if (virTestCompareToFile(actual, outconf) < 0)
         goto fail;
 
-- 
2.11.0

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]
  Powered by Linux