From nobody Tue Dec 16 08:55:57 2025 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 1525970685772111.45722682733106; Thu, 10 May 2018 09:44:45 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC1D4300484E; Thu, 10 May 2018 16:44:43 +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 9A6DD30B8448; Thu, 10 May 2018 16:44:43 +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 5C1611801243; Thu, 10 May 2018 16:44:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4AGiV4u013038 for ; Thu, 10 May 2018 12:44:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id D2FD66403C; Thu, 10 May 2018 16:44:31 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77A0A6466E for ; Thu, 10 May 2018 16:44:31 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Thu, 10 May 2018 18:44:18 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCHv2 06/12] FIXUP: Adjust test data for Jansson 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 10 May 2018 16:44:44 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Jansson formats empty arrays differently. --- .../xml2json/file-backing_basic-aio_threads.json | 9 +++----- .../file-backing_basic-cache-directsync.json | 9 +++----- .../xml2json/file-backing_basic-cache-none.json | 9 +++----- .../xml2json/file-backing_basic-cache-unsafe.json | 9 +++----- .../file-backing_basic-cache-writeback.json | 9 +++----- .../file-backing_basic-cache-writethrough.json | 9 +++----- .../xml2json/file-backing_basic-detect.json | 9 +++----- .../xml2json/file-backing_basic-noopts.json | 9 +++----- .../xml2json/file-backing_basic-unmap-detect.json | 9 +++----- .../xml2json/file-backing_basic-unmap-ignore.json | 9 +++----- .../xml2json/file-backing_basic-unmap.json | 9 +++----- .../file-qcow2-backing-chain-encryption.json | 3 +-- .../xml2json/file-qcow2-backing-chain-noopts.json | 27 ++++++++----------= ---- .../file-qcow2-backing-chain-unterminated.json | 3 +-- .../network-qcow2-backing-chain-cache-unsafe.json | 3 +-- ...etwork-qcow2-backing-chain-encryption_auth.json | 3 +-- tests/qemumigparamsdata/empty.json | 4 +--- tests/qemumigparamsdata/unsupported.json | 4 +--- tests/virmacmaptestdata/empty.json | 4 +--- 19 files changed, 49 insertions(+), 101 deletions(-) diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_thread= s.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.js= on index dcaf905085..571f661f62 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json @@ -11,8 +11,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "driver": "qed", @@ -25,8 +24,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "driver": "vmdk", @@ -46,8 +44,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "driver": "raw", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dire= ctsync.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-dir= ectsync.json index 023caf013f..fe170125bd 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.= json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.= json @@ -18,8 +18,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "cache": { @@ -39,8 +38,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "cache": { @@ -68,8 +66,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "cache": { diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none= .json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json index 023caf013f..fe170125bd 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json @@ -18,8 +18,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "cache": { @@ -39,8 +38,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "cache": { @@ -68,8 +66,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "cache": { diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsa= fe.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.= json index 5f6b94a9d5..4b3e02c480 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json @@ -18,8 +18,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "cache": { @@ -39,8 +38,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "cache": { @@ -68,8 +66,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "cache": { diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= eback.json index 9dc7d38850..c82491325e 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.j= son +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.j= son @@ -18,8 +18,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "cache": { @@ -39,8 +38,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "cache": { @@ -68,8 +66,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "cache": { diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writ= ethrough.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-w= ritethrough.json index 9dc7d38850..c82491325e 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethroug= h.json @@ -18,8 +18,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "cache": { @@ -39,8 +38,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "cache": { @@ -68,8 +66,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "cache": { diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.jso= n b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json index c1e4c40757..e3e047b51a 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-detect.json @@ -11,8 +11,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "driver": "qed", @@ -24,8 +23,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "driver": "vmdk", @@ -45,8 +43,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "driver": "raw", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.jso= n b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json index 3285a6ec67..cacf213b3d 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json @@ -10,8 +10,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "driver": "qcow", @@ -23,8 +22,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "driver": "vmdk", @@ -36,8 +34,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "driver": "raw", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-dete= ct.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.= json index b00008dd54..eb04812de0 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json @@ -12,8 +12,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "discard": "unmap", @@ -26,8 +25,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "discard": "unmap", @@ -48,8 +46,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-igno= re.json b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.= json index 5419deafc0..c60a2742a5 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json @@ -12,8 +12,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "discard": "ignore", @@ -26,8 +25,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "discard": "ignore", @@ -48,8 +46,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "discard": "ignore", diff --git a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json= b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json index 1efc462c06..87082b7d63 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json @@ -11,8 +11,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "discard": "unmap", @@ -25,8 +24,7 @@ "discard": "unmap" }, "backing": "node-c-f" -} -{ +}{ "node-name": "node-c-f", "read-only": true, "discard": "unmap", @@ -47,8 +45,7 @@ "discard": "unmap" }, "backing": "node-d-f" -} -{ +}{ "node-name": "node-d-f", "read-only": true, "discard": "unmap", diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encr= yption.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-enc= ryption.json index 94e2ecd1e2..19b8bc0cb5 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.= json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.= json @@ -14,8 +14,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "driver": "qcow2", diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noop= ts.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.= json index 3e7c08f080..6a05e38a28 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json @@ -10,8 +10,7 @@ "discard": "unmap" }, "backing": "#block313" -} -{ +}{ "node-name": "#block313", "read-only": true, "driver": "qcow2", @@ -23,8 +22,7 @@ "discard": "unmap" }, "backing": "#block556" -} -{ +}{ "node-name": "#block556", "read-only": true, "driver": "qcow2", @@ -36,8 +34,7 @@ "discard": "unmap" }, "backing": "#block767" -} -{ +}{ "node-name": "#block767", "read-only": true, "driver": "qcow2", @@ -49,8 +46,7 @@ "discard": "unmap" }, "backing": "#block937" -} -{ +}{ "node-name": "#block937", "read-only": true, "driver": "qcow2", @@ -62,8 +58,7 @@ "discard": "unmap" }, "backing": "#block1157" -} -{ +}{ "node-name": "#block1157", "read-only": true, "driver": "qcow2", @@ -75,8 +70,7 @@ "discard": "unmap" }, "backing": "#block1392" -} -{ +}{ "node-name": "#block1392", "read-only": true, "driver": "qcow2", @@ -88,8 +82,7 @@ "discard": "unmap" }, "backing": "#block1523" -} -{ +}{ "node-name": "#block1523", "read-only": true, "driver": "qcow2", @@ -101,8 +94,7 @@ "discard": "unmap" }, "backing": "#block1742" -} -{ +}{ "node-name": "#block1742", "read-only": true, "driver": "qcow2", @@ -114,8 +106,7 @@ "discard": "unmap" }, "backing": "#block1909" -} -{ +}{ "node-name": "#block1909", "read-only": true, "driver": "qcow2", diff --git a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unte= rminated.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-u= nterminated.json index 8fcdc48bb0..edaac797ea 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminate= d.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminate= d.json @@ -10,8 +10,7 @@ "discard": "unmap" }, "backing": "#block313" -} -{ +}{ "node-name": "#block313", "read-only": true, "driver": "qcow2", diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-c= ache-unsafe.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-c= hain-cache-unsafe.json index 6161f3375d..2748d33eb2 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-un= safe.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-un= safe.json @@ -30,8 +30,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "cache": { diff --git a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-e= ncryption_auth.json b/tests/qemublocktestdata/xml2json/network-qcow2-backin= g-chain-encryption_auth.json index 7e7a4e44f7..b55968ebb0 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encrypti= on_auth.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encrypti= on_auth.json @@ -26,8 +26,7 @@ "discard": "unmap" }, "backing": "node-b-f" -} -{ +}{ "node-name": "node-b-f", "read-only": true, "driver": "qcow2", diff --git a/tests/qemumigparamsdata/empty.json b/tests/qemumigparamsdata/e= mpty.json index 0db3279e44..0967ef424b 100644 --- a/tests/qemumigparamsdata/empty.json +++ b/tests/qemumigparamsdata/empty.json @@ -1,3 +1 @@ -{ - -} +{} diff --git a/tests/qemumigparamsdata/unsupported.json b/tests/qemumigparams= data/unsupported.json index 0db3279e44..0967ef424b 100644 --- a/tests/qemumigparamsdata/unsupported.json +++ b/tests/qemumigparamsdata/unsupported.json @@ -1,3 +1 @@ -{ - -} +{} diff --git a/tests/virmacmaptestdata/empty.json b/tests/virmacmaptestdata/e= mpty.json index 41b42e677b..fe51488c70 100644 --- a/tests/virmacmaptestdata/empty.json +++ b/tests/virmacmaptestdata/empty.json @@ -1,3 +1 @@ -[ - -] +[] --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list