[libvirt] [PATCHv2 13/14] vvv SQUASH HERE: reformat parseFile output data

[Ján Tomko]

Remove trailing slashes and call json_reformat
---
 tests/virjsondata/parse-Harder-out.json      |  17 +-
 tests/virjsondata/parse-NotSoSimple-out.json |  18 +-
 tests/virjsondata/parse-Simple-out.json      |   7 +-
 tests/virjsondata/parse-VeryHard-out.json    | 167 ++++++++++++++++---
 4 files changed, 177 insertions(+), 32 deletions(-)

diff --git a/tests/virjsondata/parse-Harder-out.json b/tests/virjsondata/parse-Harder-out.json
index 31b3edd731..1cdac1f0c9 100644
--- a/tests/virjsondata/parse-Harder-out.json
+++ b/tests/virjsondata/parse-Harder-out.json
@@ -1,4 +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 e679cd1813..c6553b74af 100644
--- a/tests/virjsondata/parse-NotSoSimple-out.json
+++ b/tests/virjsondata/parse-NotSoSimple-out.json
@@ -1,3 +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 c6e85e1ceb..167bdccdf8 100644
--- a/tests/virjsondata/parse-Simple-out.json
+++ b/tests/virjsondata/parse-Simple-out.json
@@ -1 +1,6 @@
-{"return":{},"id":"libvirt-1"}
+{
+    "return": {
+
+    },
+    "id": "libvirt-1"
+}
diff --git a/tests/virjsondata/parse-VeryHard-out.json b/tests/virjsondata/parse-VeryHard-out.json
index e10d605950..dc64fc1661 100644
--- a/tests/virjsondata/parse-VeryHard-out.json
+++ b/tests/virjsondata/parse-VeryHard-out.json
@@ -1,24 +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"
+}
-- 
2.19.2