From nobody Sun Feb 8 19:25:59 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554219824298158.73883786225213; Tue, 2 Apr 2019 08:43:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AEC9731688FD; Tue, 2 Apr 2019 15:43:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 83D60108F81E; Tue, 2 Apr 2019 15:43:42 +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 411CE181A135; Tue, 2 Apr 2019 15:43:42 +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 x32FgOiN012261 for ; Tue, 2 Apr 2019 11:42:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 561BF5C57E; Tue, 2 Apr 2019 15:42:24 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D12A75C21A for ; Tue, 2 Apr 2019 15:42:23 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 2 Apr 2019 17:41:53 +0200 Message-Id: <220cc0479d4137b7cbda93a6d247fcafe43d66b7.1554219669.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 14/14] virjsontest: prettify JSONFromFile test 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 02 Apr 2019 15:43:43 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko --- tests/virjsondata/parse-Harder-out.json | 22 +- tests/virjsondata/parse-NotSoSimple-out.json | 24 +- tests/virjsondata/parse-Simple-out.json | 6 +- tests/virjsondata/parse-VeryHard-out.json | 282 +++++++++---------- tests/virjsontest.c | 2 +- 5 files changed, 168 insertions(+), 168 deletions(-) diff --git a/tests/virjsondata/parse-Harder-out.json b/tests/virjsondata/pa= rse-Harder-out.json index 1cdac1f0c9..6088af7167 100644 --- a/tests/virjsondata/parse-Harder-out.json +++ b/tests/virjsondata/parse-Harder-out.json @@ -1,13 +1,13 @@ { - "return": [ - { - "filename": "unix:/home/berrange/.libvirt/qemu/lib/tck.monitor= ,server", - "label": "charmonitor" - }, - { - "filename": "pty:/dev/pts/158", - "label": "charserial0" - } - ], - "id": "libvirt-3" + "return": [ + { + "filename": "unix:/home/berrange/.libvirt/qemu/lib/tck.monitor,serve= r", + "label": "charmonitor" + }, + { + "filename": "pty:/dev/pts/158", + "label": "charserial0" + } + ], + "id": "libvirt-3" } diff --git a/tests/virjsondata/parse-NotSoSimple-out.json b/tests/virjsonda= ta/parse-NotSoSimple-out.json index c6553b74af..0eb07b0670 100644 --- a/tests/virjsondata/parse-NotSoSimple-out.json +++ b/tests/virjsondata/parse-NotSoSimple-out.json @@ -1,15 +1,15 @@ { - "QMP": { - "version": { - "qemu": { - "micro": 91, - "minor": 13, - "major": 0 - }, - "package": " (qemu-kvm-devel)" - }, - "capabilities": [ + "QMP": { + "version": { + "qemu": { + "micro": 91, + "minor": 13, + "major": 0 + }, + "package": " (qemu-kvm-devel)" + }, + "capabilities": [ =20 - ] - } + ] + } } diff --git a/tests/virjsondata/parse-Simple-out.json b/tests/virjsondata/pa= rse-Simple-out.json index 167bdccdf8..29dcfe01ef 100644 --- a/tests/virjsondata/parse-Simple-out.json +++ b/tests/virjsondata/parse-Simple-out.json @@ -1,6 +1,6 @@ { - "return": { + "return": { =20 - }, - "id": "libvirt-1" + }, + "id": "libvirt-1" } diff --git a/tests/virjsondata/parse-VeryHard-out.json b/tests/virjsondata/= parse-VeryHard-out.json index dc64fc1661..38e7b4df5e 100644 --- a/tests/virjsondata/parse-VeryHard-out.json +++ b/tests/virjsondata/parse-VeryHard-out.json @@ -1,143 +1,143 @@ { - "return": [ - { - "name": "quit" - }, - { - "name": "eject" - }, - { - "name": "change" - }, - { - "name": "screendump" - }, - { - "name": "stop" - }, - { - "name": "cont" - }, - { - "name": "system_reset" - }, - { - "name": "system_powerdown" - }, - { - "name": "device_add" - }, - { - "name": "device_del" - }, - { - "name": "cpu" - }, - { - "name": "memsave" - }, - { - "name": "pmemsave" - }, - { - "name": "migrate" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "netdev_add" - }, - { - "name": "netdev_del" - }, - { - "name": "block_resize" - }, - { - "name": "balloon" - }, - { - "name": "set_link" - }, - { - "name": "getfd" - }, - { - "name": "closefd" - }, - { - "name": "block_passwd" - }, - { - "name": "set_password" - }, - { - "name": "expire_password" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "human-monitor-command" - }, - { - "name": "query-version" - }, - { - "name": "query-commands" - }, - { - "name": "query-chardev" - }, - { - "name": "query-block" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-cpus" - }, - { - "name": "query-pci" - }, - { - "name": "query-kvm" - }, - { - "name": "query-status" - }, - { - "name": "query-mice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-spice" - }, - { - "name": "query-name" - }, - { - "name": "query-uuid" - }, - { - "name": "query-migrate" - }, - { - "name": "query-balloon" - } - ], - "id": "libvirt-2" + "return": [ + { + "name": "quit" + }, + { + "name": "eject" + }, + { + "name": "change" + }, + { + "name": "screendump" + }, + { + "name": "stop" + }, + { + "name": "cont" + }, + { + "name": "system_reset" + }, + { + "name": "system_powerdown" + }, + { + "name": "device_add" + }, + { + "name": "device_del" + }, + { + "name": "cpu" + }, + { + "name": "memsave" + }, + { + "name": "pmemsave" + }, + { + "name": "migrate" + }, + { + "name": "migrate_cancel" + }, + { + "name": "migrate_set_speed" + }, + { + "name": "client_migrate_info" + }, + { + "name": "migrate_set_downtime" + }, + { + "name": "netdev_add" + }, + { + "name": "netdev_del" + }, + { + "name": "block_resize" + }, + { + "name": "balloon" + }, + { + "name": "set_link" + }, + { + "name": "getfd" + }, + { + "name": "closefd" + }, + { + "name": "block_passwd" + }, + { + "name": "set_password" + }, + { + "name": "expire_password" + }, + { + "name": "qmp_capabilities" + }, + { + "name": "human-monitor-command" + }, + { + "name": "query-version" + }, + { + "name": "query-commands" + }, + { + "name": "query-chardev" + }, + { + "name": "query-block" + }, + { + "name": "query-blockstats" + }, + { + "name": "query-cpus" + }, + { + "name": "query-pci" + }, + { + "name": "query-kvm" + }, + { + "name": "query-status" + }, + { + "name": "query-mice" + }, + { + "name": "query-vnc" + }, + { + "name": "query-spice" + }, + { + "name": "query-name" + }, + { + "name": "query-uuid" + }, + { + "name": "query-migrate" + }, + { + "name": "query-balloon" + } + ], + "id": "libvirt-2" } diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 4a33aff785..9dcdd90b2d 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -52,7 +52,7 @@ testJSONFromFile(const void *data) } } =20 - if (!(actual =3D virJSONValueToString(injson, false))) + if (!(actual =3D virJSONValueToString(injson, true))) return -1; =20 if (virTestCompareToFile(actual, outfile) < 0) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list