]> xenbits.xensource.com Git - libvirt.git/commitdiff
virjsontest: use name instead of doc for deflatten test
authorJán Tomko <jtomko@redhat.com>
Fri, 1 Jun 2018 11:00:12 +0000 (13:00 +0200)
committerJán Tomko <jtomko@redhat.com>
Tue, 4 Sep 2018 08:19:23 +0000 (10:19 +0200)
This test gets its JSON docs from files.

Now that we have a 'name' field in testInfo, use it instead
of abusing the 'doc' field.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
tests/virjsontest.c

index 779bf441bdf8162daead19533b1d23c14ae95dbe..6f2f7f56edbed4b166848a75fc87b25c8761d0b0 100644 (file)
@@ -326,9 +326,9 @@ testJSONDeflatten(const void *data)
     int ret = -1;
 
     if (virAsprintf(&infile, "%s/virjsondata/deflatten-%s-in.json",
-                    abs_srcdir, info->doc) < 0 ||
+                    abs_srcdir, info->name) < 0 ||
         virAsprintf(&outfile, "%s/virjsondata/deflatten-%s-out.json",
-                    abs_srcdir, info->doc) < 0)
+                    abs_srcdir, info->name) < 0)
         goto cleanup;
 
     if (virTestLoadFile(infile, &indata) < 0)
@@ -339,7 +339,7 @@ testJSONDeflatten(const void *data)
 
     if ((deflattened = virJSONValueObjectDeflatten(injson))) {
         if (!info->pass) {
-            VIR_TEST_VERBOSE("%s: deflattening should have failed\n", info->doc);
+            VIR_TEST_VERBOSE("%s: deflattening should have failed\n", info->name);
             goto cleanup;
         }
     } else {
@@ -638,7 +638,7 @@ mymain(void)
                  ObjectFormatSteal, NULL, NULL, true);
 
 #define DO_TEST_DEFLATTEN(name, pass) \
-    DO_TEST_FULL(name, Deflatten, name, NULL, pass)
+    DO_TEST_FULL(name, Deflatten, NULL, NULL, pass)
 
     DO_TEST_DEFLATTEN("unflattened", true);
     DO_TEST_DEFLATTEN("basic-file", true);