[libvirt] [PATCHv2 06/12] FIXUP: Adjust test data for Jansson

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_threads.json b/tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json 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-directsync.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.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-unsafe.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-writeback.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json index 9dc7d38850..c82491325e 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.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-writethrough.json b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json index 9dc7d38850..c82491325e 100644 --- a/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json +++ b/tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.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.json 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.json 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-detect.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-ignore.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-encryption.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.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-noopts.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-unterminated.json b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json index 8fcdc48bb0..edaac797ea 100644 --- a/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json +++ b/tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.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-cache-unsafe.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json index 6161f3375d..2748d33eb2 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.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-encryption_auth.json b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json index 7e7a4e44f7..b55968ebb0 100644 --- a/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json +++ b/tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_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/empty.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/qemumigparamsdata/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/empty.json index 41b42e677b..fe51488c70 100644 --- a/tests/virmacmaptestdata/empty.json +++ b/tests/virmacmaptestdata/empty.json @@ -1,3 +1 @@ -[ - -] +[] -- 2.16.1