From 5b813b4629554c6c7d85e14fe1b5927ebc99ffb3 Mon Sep 17 00:00:00 2001
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
Date: Tue, 29 Nov 2022 08:50:42 +0000
Subject: [PATCH 03/24] tests: Fix false positive in testConfRoundTrip
 testConfRoundTrip would return 0 (success) if virConfWriteMem succeeded and
 virTestCompareToFile failed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>

Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
(cherry-pick from 4b53ce9fa7a387b7df6821aeade5a95bf0141ba5)
---
 tests/virconftest.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/virconftest.c b/tests/virconftest.c
index 83077342a9..d8f0cb137a 100644
--- a/tests/virconftest.c
+++ b/tests/virconftest.c
@@ -51,8 +51,7 @@ static int testConfRoundTrip(const void *opaque)
         fprintf(stderr, "Failed to process %s\n", srcfile);
         goto cleanup;
     }
-    ret = virConfWriteMem(buffer, &len, conf);
-    if (ret < 0) {
+    if (virConfWriteMem(buffer, &len, conf) < 0) {
         fprintf(stderr, "Failed to serialize %s back\n", srcfile);
         goto cleanup;
     }
-- 
2.27.0

