tests: qemumonitorjson: Drop redundant data from testBlockNodeNameDetectFormat

The node name and backing file name can be inferred from the hierarchy.
This will also help when converting to detect node names using
query-blockstats data.

Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
index e43f3d366ba3d59bc9ec2fcb8fc1f2f376554e0b..992fc5165e9d81faf3201fcbd486aae73726d06b 100644 (file)
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
@@ -1,15 +1,9 @@
 filename    : '/var/lib/libvirt/images/rhel7.3.1483545313'
 format node : '#block118'
 storage node: '#block078'
-backingfile : '/var/lib/libvirt/images/rhel7.3.1483536402'
-backing ptr : '#block331'
   filename    : '/var/lib/libvirt/images/rhel7.3.1483536402'
   format node : '#block331'
   storage node: '#block281'
-  backingfile : '/var/lib/libvirt/images/rhel7.3.qcow2'
-  backing ptr : '#block567'
     filename    : '/var/lib/libvirt/images/rhel7.3.qcow2'
     format node : '#block567'
     storage node: '#block424'
-    backingfile : '<null>'
-    backing ptr : '<null>'

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
index f38798d4bdc7626922c21980dd24ae3c1e6e86bb..d99576202384ffb0a55f4541f872841a2bcef0c6 100644 (file)
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
@@ -1,10 +1,6 @@
 filename    : 'gluster://gluster-host/vol0/img1'
 format node : '#block1008'
 storage node: '#block981'
-backingfile : 'gluster://gluster-host/vol0/img0'
-backing ptr : '#block349'
   filename    : 'gluster://gluster-host/vol0/img0'
   format node : '#block349'
   storage node: '#block269'
-  backingfile : '<null>'
-  backing ptr : '<null>'

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
index 2cd9087868b7c55345b1eb5648b76fb20e625d44..27d9652c691df7f38e5700628fc75cda2b7e6040 100644 (file)
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
@@ -1,31 +1,19 @@
 filename    : '/var/lib/libvirt/images/img3'
 format node : '#block153'
 storage node: '#block076'
-backingfile : '/var/lib/libvirt/images/img2'
-backing ptr : '#block357'
   filename    : '/var/lib/libvirt/images/img2'
   format node : '#block357'
   storage node: '#block290'
-  backingfile : '/var/lib/libvirt/images/img1'
-  backing ptr : '#block514'
     filename    : '/var/lib/libvirt/images/img1'
     format node : '#block514'
     storage node: '#block481'
-    backingfile : '/var/lib/libvirt/images/img0'
-    backing ptr : '#block709'
       filename    : '/var/lib/libvirt/images/img0'
       format node : '#block709'
       storage node: '#block665'
-      backingfile : '<null>'
-      backing ptr : '<null>'
 
 filename    : '/var/lib/libvirt/images/relsnap.qcow2'
 format node : '#block1177'
 storage node: '#block1027'
-backingfile : '/var/lib/libvirt/images/base.qcow2'
-backing ptr : '#block957'
   filename    : '/var/lib/libvirt/images/base.qcow2'
   format node : '#block957'
   storage node: '#block840'
-  backingfile : '<null>'
-  backing ptr : '<null>'

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
index 2c774be278f5b12e79266db4cdae6f087e9ff6bf..3ad8423a3f7d3c27d2806acfd585d69e377a5a8f 100644 (file)
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
@@ -1,11 +1,7 @@
 filename    : '/var/lib/libvirt/images/a.qcow2'
 format node : '#block170'
 storage node: '#block057'
-backingfile : '/var/lib/libvirt/images/base.qcow2'
-backing ptr : '<null>'
 
 filename    : '/var/lib/libvirt/images/b.qcow2'
 format node : '#block574'
 storage node: '#block405'
-backingfile : '/var/lib/libvirt/images/base.qcow2'
-backing ptr : '<null>'

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 5bab9f5077b1bce6d59a719396dab4396eda6fab..56a0a25e1dfad1a6dd60b02ebae0383a48339a1f 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2721,10 +2721,6 @@ testBlockNodeNameDetectFormat(virBufferPtr buf,
                           NULLSTR(entry->nodeformat));
         virBufferAsprintf(buf, "storage node: '%s'\n",
                           NULLSTR(entry->nodestorage));
-        virBufferAsprintf(buf, "backingfile : '%s'\n",
-                          NULLSTR(entry->backingstore));
-        virBufferAsprintf(buf, "backing ptr : '%s'\n",
-                          NULLSTR(entry->nodebacking));
 
         virBufferAdjustIndent(buf, 2);