Fix some tests

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2013-09-26 14:47:01 +02:00 committed by Cole Robinson
parent 19c3e4cb98
commit 153e485bb7
32 changed files with 51 additions and 51 deletions

View File

@ -20,17 +20,17 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu" type="qcow2"/> <driver name="qemu" type="qcow2"/>
<source file="/home/crobinso/src/virt-manager/tests/image-xml/image-kernel.xml"/> <source file="REPLACEME/tests/image-xml/image-kernel.xml"/>
<target dev="hda" bus="ide"/> <target dev="hda" bus="ide"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu" type="qcow"/> <driver name="qemu" type="qcow"/>
<source file="/home/crobinso/src/virt-manager/tests/image-xml/image.xml"/> <source file="REPLACEME/tests/image-xml/image.xml"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<driver name="qemu" type="vmdk"/> <driver name="qemu" type="vmdk"/>
<source file="/home/crobinso/src/virt-manager/tests/image-xml/image-format.xml"/> <source file="REPLACEME/tests/image-xml/image-format.xml"/>
<target dev="hdc" bus="ide"/> <target dev="hdc" bus="ide"/>
</disk> </disk>
<input type="mouse" bus="ps2"/> <input type="mouse" bus="ps2"/>

View File

@ -20,15 +20,15 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/root.raw"/> <source file="REPLACEME/tests/image-xml/root.raw"/>
<target dev="hda" bus="ide"/> <target dev="hda" bus="ide"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/data.raw"/> <source file="REPLACEME/tests/image-xml/data.raw"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/scratch.raw"/> <source file="REPLACEME/tests/image-xml/scratch.raw"/>
<target dev="hdd" bus="ide"/> <target dev="hdd" bus="ide"/>
</disk> </disk>
<input type="mouse" bus="ps2"/> <input type="mouse" bus="ps2"/>

View File

@ -18,15 +18,15 @@
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/root.raw"/> <source file="REPLACEME/tests/image-xml/root.raw"/>
<target dev="xvda" bus="xen"/> <target dev="xvda" bus="xen"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/data.raw"/> <source file="REPLACEME/tests/image-xml/data.raw"/>
<target dev="xvdb" bus="xen"/> <target dev="xvdb" bus="xen"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/scratch.raw"/> <source file="REPLACEME/tests/image-xml/scratch.raw"/>
<target dev="xvdc" bus="xen"/> <target dev="xvdc" bus="xen"/>
</disk> </disk>
<input type="mouse" bus="xen"/> <input type="mouse" bus="xen"/>

View File

@ -13,15 +13,15 @@
<on_crash>restart</on_crash> <on_crash>restart</on_crash>
<devices> <devices>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/root.raw"/> <source file="REPLACEME/tests/image-xml/root.raw"/>
<target dev="xvda" bus="xen"/> <target dev="xvda" bus="xen"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/data.raw"/> <source file="REPLACEME/tests/image-xml/data.raw"/>
<target dev="xvdb" bus="xen"/> <target dev="xvdb" bus="xen"/>
</disk> </disk>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/home/crobinso/src/virt-manager/tests/image-xml/scratch.raw"/> <source file="REPLACEME/tests/image-xml/scratch.raw"/>
<target dev="xvdc" bus="xen"/> <target dev="xvdc" bus="xen"/>
</disk> </disk>
<input type="mouse" bus="xen"/> <input type="mouse" bus="xen"/>

View File

@ -24,12 +24,12 @@
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='hdb' bus='ide'/> <target dev='hdb' bus='ide'/>
</disk> </disk>
<disk type='block' device='cdrom'> <disk type='block' device='cdrom'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='hdc' bus='ide'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>

View File

@ -25,12 +25,12 @@
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='hdb' bus='ide'/> <target dev='hdb' bus='ide'/>
</disk> </disk>
<disk type='block' device='cdrom'> <disk type='block' device='cdrom'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='hdc' bus='ide'/> <target dev='hdc' bus='ide'/>
<readonly/> <readonly/>
</disk> </disk>

View File

@ -29,7 +29,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -15,7 +15,7 @@
<vcpu>5</vcpu> <vcpu>5</vcpu>
<devices> <devices>
<disk type="block" device="disk"> <disk type="block" device="disk">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="xvda" bus="xen"/> <target dev="xvda" bus="xen"/>
</disk> </disk>
<input type="mouse" bus="xen"/> <input type="mouse" bus="xen"/>

View File

@ -15,7 +15,7 @@
<vcpu>5</vcpu> <vcpu>5</vcpu>
<devices> <devices>
<disk type="block" device="disk"> <disk type="block" device="disk">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="xvda" bus="xen"/> <target dev="xvda" bus="xen"/>
</disk> </disk>
<input type="mouse" bus="xen"/> <input type="mouse" bus="xen"/>

View File

@ -24,19 +24,19 @@
<serial>WD-WMAP9A966149</serial> <serial>WD-WMAP9A966149</serial>
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">
<driver type="raw"/> <driver type="raw"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="hdc" bus="ide"/> <target dev="hdc" bus="ide"/>
<driver name='phy' error_policy='stop'/> <driver name='phy' error_policy='stop'/>
<readonly/> <readonly/>
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu" type="qcow2"/> <driver name="qemu" type="qcow2"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="hdd" bus="ide"/> <target dev="hdd" bus="ide"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">
@ -54,12 +54,12 @@
</disk> </disk>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<driver name="phy" cache="none"/> <driver name="phy" cache="none"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fdb" bus="fdc"/> <target dev="fdb" bus="fdc"/>
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu" type="qcow2" cache="none"/> <driver name="qemu" type="qcow2" cache="none"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vda" bus="virtio"/> <target dev="vda" bus="virtio"/>
</disk> </disk>
<input type="mouse" bus="ps2"/> <input type="mouse" bus="ps2"/>

View File

@ -19,13 +19,13 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk"> <disk type="file" device="disk">
<source file="/dev/loop0"/> <source file="/dev/null"/>
<target dev="hda" bus="ide"/> <target dev="hda" bus="ide"/>
<serial>frob</serial> <serial>frob</serial>
<driver name="test" type="raw"/> <driver name="test" type="raw"/>
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="hdb" bus="ide"/> <target dev="hdb" bus="ide"/>
</disk> </disk>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
@ -33,7 +33,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu" type="qcow2"/> <driver name="qemu" type="qcow2"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="hdd" bus="ide"/> <target dev="hdd" bus="ide"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">
@ -56,12 +56,12 @@
</disk> </disk>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<driver name="phy" cache="none"/> <driver name="phy" cache="none"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fdb" bus="fdc"/> <target dev="fdb" bus="fdc"/>
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu" type="qcow2" cache="none"/> <driver name="qemu" type="qcow2" cache="none"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vda" bus="virtio"/> <target dev="vda" bus="virtio"/>
</disk> </disk>
<input type="mouse" bus="ps2"/> <input type="mouse" bus="ps2"/>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<filesystem> <filesystem>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<filesystem type="mount" accessmode="passthrough"> <filesystem type="mount" accessmode="passthrough">

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<graphics type="vnc" passwd="foobar" port="100" listen="0.0.0.0"/> <graphics type="vnc" passwd="foobar" port="100" listen="0.0.0.0"/>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<graphics type="vnc" passwd="newpass" port="6000" listen="1.2.3.4" keymap="en-us"/> <graphics type="vnc" passwd="newpass" port="6000" listen="1.2.3.4" keymap="en-us"/>

View File

@ -41,7 +41,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -44,7 +44,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='vdb' bus='virtio'/> <target dev='vdb' bus='virtio'/>
</disk> </disk>
<disk type='block' device='cdrom'> <disk type='block' device='cdrom'>

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='vdb' bus='virtio'/> <target dev='vdb' bus='virtio'/>
</disk> </disk>
<disk type='block' device='cdrom'> <disk type='block' device='cdrom'>

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='vdb' bus='virtio'/> <target dev='vdb' bus='virtio'/>
</disk> </disk>
<disk type='block' device='cdrom'> <disk type='block' device='cdrom'>

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<sound model="sb16"/> <sound model="sb16"/>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<sound model="ac97"/> <sound model="ac97"/>

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<driver name='qemu'/> <driver name='qemu'/>
<source dev='/dev/loop0'/> <source dev='/dev/null'/>
<target dev='vdb' bus='virtio'/> <target dev='vdb' bus='virtio'/>
</disk> </disk>
<disk type='block' device='cdrom'> <disk type='block' device='cdrom'>

View File

@ -36,7 +36,7 @@
</disk> </disk>
<disk type="block" device="disk"> <disk type="block" device="disk">
<driver name="qemu"/> <driver name="qemu"/>
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="vdb" bus="virtio"/> <target dev="vdb" bus="virtio"/>
</disk> </disk>
<disk type="block" device="cdrom"> <disk type="block" device="cdrom">

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<video> <video>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<video> <video>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<watchdog model="ib700" action="none"/> <watchdog model="ib700" action="none"/>

View File

@ -20,7 +20,7 @@
<devices> <devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator> <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="block" device="floppy"> <disk type="block" device="floppy">
<source dev="/dev/loop0"/> <source dev="/dev/null"/>
<target dev="fda" bus="fdc"/> <target dev="fda" bus="fdc"/>
</disk> </disk>
<watchdog model="i6300esb" action="poweroff"/> <watchdog model="i6300esb" action="poweroff"/>

View File

@ -271,7 +271,7 @@ class XMLParseTest(unittest.TestCase):
disk6.size = 1 disk6.size = 1
check = self._make_checker(disk1) check = self._make_checker(disk1)
check("path", "/tmp/test.img", "/dev/loop0") check("path", "/tmp/test.img", "/dev/null")
disk1.sync_path_props() disk1.sync_path_props()
check("driver_name", None, "test") check("driver_name", None, "test")
check("driver_type", None, "raw") check("driver_type", None, "raw")
@ -279,7 +279,7 @@ class XMLParseTest(unittest.TestCase):
check = self._make_checker(disk3) check = self._make_checker(disk3)
check("type", "block", "dir", "file", "block") check("type", "block", "dir", "file", "block")
check("path", "/dev/loop0", None) check("path", "/dev/null", None)
disk3.sync_path_props() disk3.sync_path_props()
check("device", "cdrom", "floppy") check("device", "cdrom", "floppy")
check("read_only", True, False) check("read_only", True, False)