From a1ac4c880bc52b3cf112b76295cfd56d5ba0eea9 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 11 Jul 2017 14:40:05 +0200
Subject: [PATCH] tests: virjson: Reuse VIR_TEST_VERBOSE in testJSONCopy

Use VIR_TEST_VERBOSE instead of calling virTestGetVerbose and
conditionally fprintf. Additionally remove redundant setting of 'ret' to
-1.
---
 tests/virjsontest.c | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/tests/virjsontest.c b/tests/virjsontest.c
index b3a230a02d..b9c2106207 100644
--- a/tests/virjsontest.c
+++ b/tests/virjsontest.c
@@ -240,40 +240,31 @@ testJSONCopy(const void *data)
 
     json = virJSONValueFromString(info->doc);
     if (!json) {
-        if (virTestGetVerbose())
-            fprintf(stderr, "Failed to parse %s\n", info->doc);
-        ret = -1;
+        VIR_TEST_VERBOSE("Failed to parse %s\n", info->doc);
         goto cleanup;
     }
 
     jsonCopy = virJSONValueCopy(json);
     if (!jsonCopy) {
-        if (virTestGetVerbose())
-            fprintf(stderr, "Failed to copy JSON data\n");
-        ret = -1;
+        VIR_TEST_VERBOSE("Failed to copy JSON data\n");
         goto cleanup;
     }
 
     result = virJSONValueToString(json, false);
     if (!result) {
-        if (virTestGetVerbose())
-            fprintf(stderr, "Failed to format original JSON data\n");
-        ret = -1;
+        VIR_TEST_VERBOSE("Failed to format original JSON data\n");
         goto cleanup;
     }
 
     resultCopy = virJSONValueToString(json, false);
     if (!resultCopy) {
-        if (virTestGetVerbose())
-            fprintf(stderr, "Failed to format copied JSON data\n");
-        ret = -1;
+        VIR_TEST_VERBOSE("Failed to format copied JSON data\n");
         goto cleanup;
     }
 
     if (STRNEQ(result, resultCopy)) {
         if (virTestGetVerbose())
             virTestDifference(stderr, result, resultCopy);
-        ret = -1;
         goto cleanup;
     }
 
@@ -282,24 +273,19 @@ testJSONCopy(const void *data)
 
     result = virJSONValueToString(json, true);
     if (!result) {
-        if (virTestGetVerbose())
-            fprintf(stderr, "Failed to format original JSON data\n");
-        ret = -1;
+        VIR_TEST_VERBOSE("Failed to format original JSON data\n");
         goto cleanup;
     }
 
     resultCopy = virJSONValueToString(json, true);
     if (!resultCopy) {
-        if (virTestGetVerbose())
-            fprintf(stderr, "Failed to format copied JSON data\n");
-        ret = -1;
+        VIR_TEST_VERBOSE("Failed to format copied JSON data\n");
         goto cleanup;
     }
 
     if (STRNEQ(result, resultCopy)) {
         if (virTestGetVerbose())
             virTestDifference(stderr, result, resultCopy);
-        ret = -1;
         goto cleanup;
     }
 
-- 
GitLab