[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 04/24] 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.
---
 .../qemumonitorjson-nodename-basic.result                    |  6 ------
 .../qemumonitorjson-nodename-gluster.result                  |  4 ----
 .../qemumonitorjson-nodename-relative.result                 | 12 ------------
 .../qemumonitorjson-nodename-same-backing.result             |  4 ----
 tests/qemumonitorjsontest.c                                  |  4 ----
 5 files changed, 30 deletions(-)

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
index e43f3d366..992fc5165 100644
--- 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 f38798d4b..d99576202 100644
--- 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 2cd908786..27d9652c6 100644
--- 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 2c774be27..3ad8423a3 100644
--- 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 5bab9f507..56a0a25e1 100644
--- 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);

-- 
2.13.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]