From c4a5b77ffb594d73d7a5e9542f8bbc47c85ece75 Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 7 Mar 2018 10:44:55 +0100
Subject: [PATCH] tests: domainsnapshotxml2xml: Remove testing with allowed
 format detection

We have a test of the domain XML that allows format detection, so
there's no need to do it for snapshot XMLs where the parameter would
influence the domain XML portion.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml | 6 ++++++
 tests/domainsnapshotxml2xmlout/external_vm_redefine.xml   | 1 +
 tests/domainsnapshotxml2xmlout/full_domain.xml            | 1 +
 tests/domainsnapshotxml2xmlout/metadata.xml               | 1 +
 tests/domainsnapshotxml2xmltest.c                         | 3 ---
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
index a6eb5df987..a9adbdc2a3 100644
--- a/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/domainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@@ -41,31 +41,37 @@
     <devices>
       <emulator>/usr/bin/qemu-system-i686</emulator>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
       </disk>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest2'/>
         <target dev='hdb' bus='ide'/>
         <address type='drive' controller='0' bus='1' target='0' unit='0'/>
       </disk>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest3'/>
         <target dev='hdc' bus='ide'/>
         <address type='drive' controller='0' bus='2' target='0' unit='0'/>
       </disk>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest4'/>
         <target dev='hdd' bus='ide'/>
         <address type='drive' controller='0' bus='3' target='0' unit='0'/>
       </disk>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest5'/>
         <target dev='hde' bus='ide'/>
         <address type='drive' controller='0' bus='4' target='0' unit='0'/>
       </disk>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest6'/>
         <target dev='hdf' bus='ide'/>
         <address type='drive' controller='0' bus='5' target='0' unit='0'/>
diff --git a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
index d620c3b116..415fa0aed3 100644
--- a/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/domainsnapshotxml2xmlout/external_vm_redefine.xml
@@ -31,6 +31,7 @@
     <devices>
       <emulator>/usr/bin/qemu-system-i686</emulator>
       <disk type='block' device='disk' snapshot='no'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml
index a943d174f8..ff3f08950b 100644
--- a/tests/domainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/domainsnapshotxml2xmlout/full_domain.xml
@@ -24,6 +24,7 @@
     <devices>
       <emulator>/usr/bin/qemu-system-i686</emulator>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml
index d09444a76d..1e50494cb5 100644
--- a/tests/domainsnapshotxml2xmlout/metadata.xml
+++ b/tests/domainsnapshotxml2xmlout/metadata.xml
@@ -28,6 +28,7 @@
     <devices>
       <emulator>/usr/bin/qemu-system-i686</emulator>
       <disk type='block' device='disk'>
+        <driver name='qemu' type='raw'/>
         <source dev='/dev/HostVG/QEMUGuest1'/>
         <target dev='hda' bus='ide'/>
         <address type='drive' controller='0' bus='0' target='0' unit='0'/>
diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 9ddd1eca7f..5ea0f325de 100644
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -156,9 +156,6 @@ mymain(void)
     if (qemuTestDriverInit(&driver) < 0)
         return EXIT_FAILURE;
 
-    /* TODO: test with format probing disabled too */
-    driver.config->allowDiskFormatProbing = true;
-
     if (VIR_ALLOC(testSnapshotXMLVariableLineRegex) < 0)
         goto cleanup;
 
-- 
2.47.2