提交 c4a5b77f 编写于 作者: P Peter Krempa

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: NPeter Krempa <pkrempa@redhat.com>
上级 9fc79688
...@@ -41,31 +41,37 @@ ...@@ -41,31 +41,37 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest2'/> <source dev='/dev/HostVG/QEMUGuest2'/>
<target dev='hdb' bus='ide'/> <target dev='hdb' bus='ide'/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest3'/> <source dev='/dev/HostVG/QEMUGuest3'/>
<target dev='hdc' bus='ide'/> <target dev='hdc' bus='ide'/>
<address type='drive' controller='0' bus='2' target='0' unit='0'/> <address type='drive' controller='0' bus='2' target='0' unit='0'/>
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest4'/> <source dev='/dev/HostVG/QEMUGuest4'/>
<target dev='hdd' bus='ide'/> <target dev='hdd' bus='ide'/>
<address type='drive' controller='0' bus='3' target='0' unit='0'/> <address type='drive' controller='0' bus='3' target='0' unit='0'/>
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest5'/> <source dev='/dev/HostVG/QEMUGuest5'/>
<target dev='hde' bus='ide'/> <target dev='hde' bus='ide'/>
<address type='drive' controller='0' bus='4' target='0' unit='0'/> <address type='drive' controller='0' bus='4' target='0' unit='0'/>
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest6'/> <source dev='/dev/HostVG/QEMUGuest6'/>
<target dev='hdf' bus='ide'/> <target dev='hdf' bus='ide'/>
<address type='drive' controller='0' bus='5' target='0' unit='0'/> <address type='drive' controller='0' bus='5' target='0' unit='0'/>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk' snapshot='no'> <disk type='block' device='disk' snapshot='no'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/>
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu' type='raw'/>
<source dev='/dev/HostVG/QEMUGuest1'/> <source dev='/dev/HostVG/QEMUGuest1'/>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/>
......
...@@ -156,9 +156,6 @@ mymain(void) ...@@ -156,9 +156,6 @@ mymain(void)
if (qemuTestDriverInit(&driver) < 0) if (qemuTestDriverInit(&driver) < 0)
return EXIT_FAILURE; return EXIT_FAILURE;
/* TODO: test with format probing disabled too */
driver.config->allowDiskFormatProbing = true;
if (VIR_ALLOC(testSnapshotXMLVariableLineRegex) < 0) if (VIR_ALLOC(testSnapshotXMLVariableLineRegex) < 0)
goto cleanup; goto cleanup;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册