From 0a2866b42a315055aa82a0185f7978852fdf0acb Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 3 Jul 2017 15:02:38 +0200
Subject: [PATCH] tests: virjson: Modify logic in testJSONFromString

To allow better testing in case where the string was parsed, modify the
logic so that the regular code path is not included in a conditional
block.
---
 tests/virjsontest.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/virjsontest.c b/tests/virjsontest.c
index b9c2106207..a5ffc47074 100644
--- a/tests/virjsontest.c
+++ b/tests/virjsontest.c
@@ -27,24 +27,24 @@ testJSONFromString(const void *data)
 
     json = virJSONValueFromString(info->doc);
 
-    if (info->pass) {
-        if (!json) {
+    if (!json) {
+        if (info->pass) {
             VIR_TEST_VERBOSE("Fail to parse %s\n", info->doc);
-            ret = -1;
-            goto cleanup;
-        } else {
-            VIR_TEST_DEBUG("Parsed %s\n", info->doc);
-        }
-    } else {
-        if (json) {
-            VIR_TEST_VERBOSE("Should not have parsed %s\n", info->doc);
-            ret = -1;
             goto cleanup;
         } else {
             VIR_TEST_DEBUG("Fail to parse %s\n", info->doc);
+            ret = 0;
+            goto cleanup;
         }
     }
 
+    if (!info->pass) {
+        VIR_TEST_VERBOSE("Should not have parsed %s\n", info->doc);
+        goto cleanup;
+    }
+
+    VIR_TEST_DEBUG("Parsed %s\n", info->doc);
+
     ret = 0;
 
  cleanup:
-- 
GitLab