From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 15 Jul 2019 15:58:02 +0000 (+0100)
Subject: tests: don't assume "localhost" only resolves to 1/2 IPs
X-Git-Tag: v5.6.0-rc1~204
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f58bcb80b2ca1791acd5ec0255297a44aa9d4dbe;p=thirdparty%2Flibvirt.git

tests: don't assume "localhost" only resolves to 1/2 IPs

On Debian derived distros "localhost" can resolve to the normal
"127.0.0.1" and "::1", but it can also resolve to "127.0.1.1"

Rewrite the code so that it doesn't assume a fixed number of IPs.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c
index cd031914ab..7aaa8f97fa 100644
--- a/tests/virsystemdtest.c
+++ b/tests/virsystemdtest.c
@@ -548,22 +548,21 @@ testActivation(bool useNames)
     size_t nsockIP;
     int ret = -1;
     size_t i;
-    const char *names2 = "demo-unix.socket:demo-ip.socket";
-    const char *names3 = "demo-unix.socket:demo-ip.socket:demo-ip.socket";
     char nfdstr[INT_BUFSIZE_BOUND(size_t)];
     char pidstr[INT_BUFSIZE_BOUND(pid_t)];
     virSystemdActivationMap map[2];
     int *fds = NULL;
     size_t nfds = 0;
     VIR_AUTOPTR(virSystemdActivation) act = NULL;
+    VIR_AUTOCLEAN(virBuffer) names = VIR_BUFFER_INITIALIZER;
+
+    virBufferAddLit(&names, "demo-unix.socket");
 
     if (testActivationCreateFDs(&sockUNIX, &sockIP, &nsockIP) < 0)
         return -1;
 
-    if (nsockIP != 1 && nsockIP != 2) {
-        fprintf(stderr, "Got %zu IP sockets but expected only 1 or 2\n", nsockIP);
-        goto cleanup;
-    }
+    for (i = 0; i < nsockIP; i++)
+        virBufferAddLit(&names, ":demo-ip.socket");
 
     snprintf(nfdstr, sizeof(nfdstr), "%zu", 1 + nsockIP);
     snprintf(pidstr, sizeof(pidstr), "%lld", (long long)getpid());
@@ -571,8 +570,11 @@ testActivation(bool useNames)
     setenv("LISTEN_FDS", nfdstr, 1);
     setenv("LISTEN_PID", pidstr, 1);
 
+    if (virBufferError(&names))
+        goto cleanup;
+
     if (useNames)
-        setenv("LISTEN_FDNAMES", nsockIP == 1 ? names2 : names3, 1);
+        setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), 1);
     else
         unsetenv("LISTEN_FDNAMES");