openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/image-xml/image2guest/image-format-out.xml
View File

@ -20,17 +20,17 @@
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<disk type="file" device="disk">
<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"/>
</disk>
<disk type="file" device="disk">
<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"/>
</disk>
<disk type="file" device="disk">
<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"/>
</disk>
<input type="mouse" bus="ps2"/>

6
tests/image-xml/image2guest/image-xenfv32.xml
View File

@ -20,15 +20,15 @@
<devices>
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
<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"/>
</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"/>
</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"/>
</disk>
<input type="mouse" bus="ps2"/>

6
tests/image-xml/image2guest/image-xenpv32-kernel.xml
View File

@ -18,15 +18,15 @@
<on_crash>restart</on_crash>
<devices>
<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"/>
</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"/>
</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"/>
</disk>
<input type="mouse" bus="xen"/>

6
tests/image-xml/image2guest/image-xenpv32.xml
View File

@ -13,15 +13,15 @@
<on_crash>restart</on_crash>
<devices>
<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"/>
</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"/>
</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"/>
</disk>
<input type="mouse" bus="xen"/>

4
tests/xmlconfig-xml/boot-windowsxp-kvm.xml
View File

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

4
tests/xmlconfig-xml/install-windowsxp-kvm.xml
View File

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

2
tests/xmlparse-xml/add-devices-in.xml
View File

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

2
tests/xmlparse-xml/change-boot-kernel-in.xml
View File

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

2
tests/xmlparse-xml/change-boot-kernel-out.xml
View File

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

10
tests/xmlparse-xml/change-disk-in.xml
View File

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

10
tests/xmlparse-xml/change-disk-out.xml
View File

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

2
tests/xmlparse-xml/change-filesystems-in.xml
View File

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

2
tests/xmlparse-xml/change-filesystems-out.xml
View File

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

2
tests/xmlparse-xml/change-graphics-in.xml
View File

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

2
tests/xmlparse-xml/change-graphics-out.xml
View File

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

2
tests/xmlparse-xml/change-guest-in.xml
View File

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

2
tests/xmlparse-xml/change-guest-out.xml
View File

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

2
tests/xmlparse-xml/change-rng-egd-in.xml
View File

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

2
tests/xmlparse-xml/change-rng-egd-out.xml
View File

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

2
tests/xmlparse-xml/change-rng-random-in.xml
View File

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

2
tests/xmlparse-xml/change-rng-random-out.xml
View File

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

2
tests/xmlparse-xml/change-smartcard-in.xml
View File

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

2
tests/xmlparse-xml/change-smartcard-out.xml
View File

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

2
tests/xmlparse-xml/change-sounds-in.xml
View File

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

2
tests/xmlparse-xml/change-sounds-out.xml
View File

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

2
tests/xmlparse-xml/change-tpm-in.xml
View File

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

2
tests/xmlparse-xml/change-tpm-out.xml
View File

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

2
tests/xmlparse-xml/change-videos-in.xml
View File

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

2
tests/xmlparse-xml/change-videos-out.xml
View File

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

2
tests/xmlparse-xml/change-watchdogs-in.xml
View File

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

2
tests/xmlparse-xml/change-watchdogs-out.xml
View File

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

4
tests/xmlparse.py
View File

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