From nobody Fri May 3 00:59:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1499777056684104.94150939260976; Tue, 11 Jul 2017 05:44:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E6914C0272CE; Tue, 11 Jul 2017 12:44:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 616DC60600; Tue, 11 Jul 2017 12:44:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 25EA23FADF; Tue, 11 Jul 2017 12:44:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v6BCi9db011467 for ; Tue, 11 Jul 2017 08:44:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 910245C549; Tue, 11 Jul 2017 12:44:09 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id E334317B18; Tue, 11 Jul 2017 12:44:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E6914C0272CE Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E6914C0272CE From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 11 Jul 2017 14:44:11 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH] tests: virjson: Reuse VIR_TEST_VERBOSE in testJSONCopy X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 11 Jul 2017 12:44:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Use VIR_TEST_VERBOSE instead of calling virTestGetVerbose and conditionally fprintf. Additionally remove redundant setting of 'ret' to -1. --- Pushed as trivial. tests/virjsontest.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/tests/virjsontest.c b/tests/virjsontest.c index b3a230a02..b9c210620 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -240,40 +240,31 @@ testJSONCopy(const void *data) json =3D virJSONValueFromString(info->doc); if (!json) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to parse %s\n", info->doc); - ret =3D -1; + VIR_TEST_VERBOSE("Failed to parse %s\n", info->doc); goto cleanup; } jsonCopy =3D virJSONValueCopy(json); if (!jsonCopy) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to copy JSON data\n"); - ret =3D -1; + VIR_TEST_VERBOSE("Failed to copy JSON data\n"); goto cleanup; } result =3D virJSONValueToString(json, false); if (!result) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format original JSON data\n"); - ret =3D -1; + VIR_TEST_VERBOSE("Failed to format original JSON data\n"); goto cleanup; } resultCopy =3D virJSONValueToString(json, false); if (!resultCopy) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format copied JSON data\n"); - ret =3D -1; + VIR_TEST_VERBOSE("Failed to format copied JSON data\n"); goto cleanup; } if (STRNEQ(result, resultCopy)) { if (virTestGetVerbose()) virTestDifference(stderr, result, resultCopy); - ret =3D -1; goto cleanup; } @@ -282,24 +273,19 @@ testJSONCopy(const void *data) result =3D virJSONValueToString(json, true); if (!result) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format original JSON data\n"); - ret =3D -1; + VIR_TEST_VERBOSE("Failed to format original JSON data\n"); goto cleanup; } resultCopy =3D virJSONValueToString(json, true); if (!resultCopy) { - if (virTestGetVerbose()) - fprintf(stderr, "Failed to format copied JSON data\n"); - ret =3D -1; + VIR_TEST_VERBOSE("Failed to format copied JSON data\n"); goto cleanup; } if (STRNEQ(result, resultCopy)) { if (virTestGetVerbose()) virTestDifference(stderr, result, resultCopy); - ret =3D -1; goto cleanup; } --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list