From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 6 Aug 2019 15:45:14 +0000 (+0100)
Subject: tests: fix debug messages wrt selinux context when test fails
X-Git-Tag: v5.8.0-rc1~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3caf0339168b99d27a4385b9f2bba4a4c2b29416;p=thirdparty%2Flibvirt.git

tests: fix debug messages wrt selinux context when test fails

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

diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 17d6e5f3b3..3c9eb8683a 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -187,7 +187,8 @@ static int testIdentityGetSystem(const void *data)
         goto cleanup;
 
     if (STRNEQ_NULLABLE(val, context)) {
-        VIR_DEBUG("Unexpected SELinux context attribute");
+        VIR_DEBUG("Want SELinux context '%s' got '%s'",
+                  context, val);
         goto cleanup;
     }
 
diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index 5015273e55..aaecfe7987 100644
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -140,8 +140,8 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUSED)
         goto cleanup;
     }
     if (STRNEQ_NULLABLE("foo_u:bar_r:wizz_t:s0-s0:c0.c1023", gotSELinuxContext)) {
-        fprintf(stderr, "Want groupname 'foo_u:bar_r:wizz_t:s0-s0:c0.c1023' got '%s'\n",
-                NULLSTR(gotGroupID));
+        fprintf(stderr, "Want SELinux context 'foo_u:bar_r:wizz_t:s0-s0:c0.c1023' got '%s'\n",
+                NULLSTR(gotSELinuxContext));
         goto cleanup;
     }