disk-mirror-old has different output file for the active and inactive parts, which should be named accordingly; on the other hand, both output files for disk-backing-chains-noindex are identical, so it makes sense to only keep around one and remove the (in-)active suffix. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- .../disk-backing-chains-noindex-inactive.xml | 156 ------------------ ...ve.xml => disk-backing-chains-noindex.xml} | 0 ...ror-old.xml => disk-mirror-old-active.xml} | 0 3 files changed, 156 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex-active.xml => disk-backing-chains-noindex.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-mirror-old.xml => disk-mirror-old-active.xml} (100%) diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml deleted file mode 100644 index 29d1ad002d..0000000000 --- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex-inactive.xml +++ /dev/null @@ -1,156 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='gluster' name='Volume2/Image'> - <host transport='unix' socket='/path/to/sock'/> - </source> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/missing-backing-store.qcow'/> - </backingStore> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <source protocol='nbd' name='bar'> - <host transport='unix' socket='/var/run/nbdsock'/> - </source> - <backingStore type='block'> - <format type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - <backingStore type='file'> - <format type='vmdk'/> - <source file='/tmp/image2'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image3.qcow'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image4.qcow'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image5.qcow'/> - <backingStore type='file'> - <format type='raw'/> - <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> - <backingStore/> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - <target dev='vdb' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='raw'/> - <source protocol='gluster' name='Volume1/Image'> - <host name='example.org' port='6000'/> - </source> - <backingStore/> - <target dev='vdc' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> - </disk> - <disk type='network' device='disk'> - <driver name='qemu' type='qcow2'/> - <auth username='myname'> - <secret type='ceph' usage='mycluster_myname'/> - </auth> - <source protocol='rbd' name='pool/image'> - <host name='mon1.example.org' port='6321'/> - <host name='mon2.example.org' port='6322'/> - <host name='mon3.example.org' port='6322'/> - </source> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/tmp/image.qcow'/> - <backingStore/> - </backingStore> - <target dev='vdd' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> - </disk> - <disk type='block' device='disk'> - <driver name='qemu' type='qcow2'/> - <source dev='/dev/HostVG/QEMUGuest11'/> - <target dev='vde' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1484071880'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1484071877'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1484071876'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1484071872'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483615252'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483605924'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483605920'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483546244'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483545901'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483545313'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.1483536402'/> - <backingStore type='file'> - <format type='qcow2'/> - <source file='/var/lib/libvirt/images/rhel7.qcow2'/> - <backingStore/> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - </backingStore> - <target dev='vdf' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> - </memballoon> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-backing-chains-noindex-active.xml rename to tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml similarity index 100% rename from tests/qemuxml2xmloutdata/disk-mirror-old.xml rename to tests/qemuxml2xmloutdata/disk-mirror-old-active.xml -- 2.20.1

There are a few cases where we are using either WHEN_ACTIVE or WHEN_INACTIVE even though WHEN_BOTH would work perfectly fine: for those, start using the simpler DO_TEST() macro. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com&gt; --- ...ource-path.xml => channel-unix-source-path-active.xml} | 3 +++ ...rce-path.xml => channel-unix-source-path-inactive.xml} | 0 ...sk-active-commit.xml => disk-active-commit-active.xml} | 0 ...-active-commit.xml => disk-active-commit-inactive.xml} | 8 ++------ ...labelskip.xml => seclabel-static-labelskip-active.xml} | 0 ...belskip.xml => seclabel-static-labelskip-inactive.xml} | 7 ++----- tests/qemuxml2xmltest.c | 6 +++--- 7 files changed, 10 insertions(+), 14 deletions(-) copy tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-active.xml} (86%) rename tests/qemuxml2xmloutdata/{channel-unix-source-path.xml => channel-unix-source-path-inactive.xml} (100%) copy tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-active.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-active-commit.xml => disk-active-commit-inactive.xml} (86%) copy tests/qemuxml2xmloutdata/{seclabel-static-labelskip.xml => seclabel-static-labelskip-active.xml} (100%) rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip.xml => seclabel-static-labelskip-inactive.xml} (86%) diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml similarity index 86% copy from tests/qemuxml2xmloutdata/channel-unix-source-path.xml copy to tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml index 2d8fa1e3ac..4c2a02b49a 100644 --- a/tests/qemuxml2xmloutdata/channel-unix-source-path.xml +++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml @@ -22,14 +22,17 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </controller> <channel type='unix'> + <source mode='bind' path='/tmp/channel/QEMUGuest1.org.qemu.guest_agent.0'/> <target type='virtio' name='org.qemu.guest_agent.0'/> <address type='virtio-serial' controller='0' bus='0' port='1'/> </channel> <channel type='unix'> + <source mode='bind' path='/tmp/channel/domain-QEMUGuest1/org.qemu.guest_agent.1'/> <target type='virtio' name='org.qemu.guest_agent.1'/> <address type='virtio-serial' controller='0' bus='0' port='2'/> </channel> <channel type='unix'> + <source mode='bind' path='/tmp/channel/domain-1-QEMUGuest1/org.qemu.guest_agent.2'/> <target type='virtio' name='org.qemu.guest_agent.2'/> <address type='virtio-serial' controller='0' bus='0' port='3'/> </channel> diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml similarity index 100% rename from tests/qemuxml2xmloutdata/channel-unix-source-path.xml rename to tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml diff --git a/tests/qemuxml2xmloutdata/disk-active-commit.xml b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml similarity index 100% copy from tests/qemuxml2xmloutdata/disk-active-commit.xml copy to tests/qemuxml2xmloutdata/disk-active-commit-active.xml diff --git a/tests/qemuxml2xmloutdata/disk-active-commit.xml b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml similarity index 86% rename from tests/qemuxml2xmloutdata/disk-active-commit.xml rename to tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml index cc26af1096..b14345049d 100644 --- a/tests/qemuxml2xmloutdata/disk-active-commit.xml +++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml @@ -1,4 +1,4 @@ -<domain type='qemu' id='1'> +<domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219136</memory> @@ -17,15 +17,11 @@ <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/tmp/HostVG/QEMUGuest1-snap'/> - <backingStore type='block' index='1'> + <backingStore type='block'> <format type='raw'/> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> </backingStore> - <mirror type='block' job='active-commit'> - <format type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'/> - </mirror> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml similarity index 100% copy from tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml copy to tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml similarity index 86% rename from tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml rename to tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml index 7c448675e2..e705b5452c 100644 --- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip.xml +++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml @@ -1,4 +1,4 @@ -<domain type='qemu' id='1'> +<domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> <memory unit='KiB'>219100</memory> @@ -16,9 +16,7 @@ <emulator>/usr/bin/qemu-system-i686</emulator> <disk type='block' device='disk'> <driver name='qemu' type='raw'/> - <source dev='/dev/HostVG/QEMUGuest1'> - <seclabel model='selinux' labelskip='yes'/> - </source> + <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> @@ -38,6 +36,5 @@ </devices> <seclabel type='static' model='selinux' relabel='yes'> <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label> - <imagelabel>system_u:system_r:svirt_custom_t:s0:c192,c392</imagelabel> </seclabel> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b38cbd6994..59535e0f19 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -375,7 +375,7 @@ mymain(void) QEMU_CAPS_CCW); DO_TEST("disk-mirror-old", NONE); DO_TEST("disk-mirror", NONE); - DO_TEST_FULL("disk-active-commit", WHEN_ACTIVE, GIC_NONE, NONE); + DO_TEST("disk-active-commit", NONE); DO_TEST("graphics-listen-network", NONE); DO_TEST("graphics-vnc", NONE); DO_TEST("graphics-vnc-websocket", NONE); @@ -451,7 +451,7 @@ mymain(void) DO_TEST("channel-virtio", NONE); DO_TEST("channel-virtio-state", NONE); - DO_TEST_FULL("channel-unix-source-path", WHEN_INACTIVE, GIC_NONE, NONE); + DO_TEST("channel-unix-source-path", NONE); DO_TEST("hostdev-usb-address", NONE); DO_TEST("hostdev-pci-address", NONE); @@ -549,7 +549,7 @@ mymain(void) DO_TEST_FULL("seclabel-dynamic-labelskip", WHEN_INACTIVE, GIC_NONE, NONE); DO_TEST_FULL("seclabel-dynamic-relabel", WHEN_INACTIVE, GIC_NONE, NONE); DO_TEST("seclabel-static", NONE); - DO_TEST_FULL("seclabel-static-labelskip", WHEN_ACTIVE, GIC_NONE, NONE); + DO_TEST("seclabel-static-labelskip", NONE); DO_TEST("seclabel-none", NONE); DO_TEST("seclabel-dac-none", NONE); DO_TEST("seclabel-dynamic-none", NONE); -- 2.20.1

On Fri, 2019-03-01 at 14:59 +0100, Ján Tomko wrote: [...] And having the active version side-by-side makes their absence more obvious, no? So this still seems valuable. [...] Again, it highlights the fact that the active commit feature is, as the name suggests, only useful for the active XML :) [...] Same as above. Basically I see no reason not to cover both active and inactive when possible, because even when the feature is only going to manifest itself only in one of the two output files, the fact that it does *not* show up in the other one represent some amount of useful (negative) coverage. -- Andrea Bolognani / Red Hat / Virtualization