[libvirt] [PATCHv2 14/14] virjsontest: prettify JSONFromFile test

Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- 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/parse-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,server", + "label": "charmonitor" + }, + { + "filename": "pty:/dev/pts/158", + "label": "charserial0" + } + ], + "id": "libvirt-3" } diff --git a/tests/virjsondata/parse-NotSoSimple-out.json b/tests/virjsondata/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": [ - ] - } + ] + } } diff --git a/tests/virjsondata/parse-Simple-out.json b/tests/virjsondata/parse-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": { - }, - "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) } } - if (!(actual = virJSONValueToString(injson, false))) + if (!(actual = virJSONValueToString(injson, true))) return -1; if (virTestCompareToFile(actual, outfile) < 0) -- 2.19.2