[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[virt-tools-list] [PATCH] Fix some tests



Signed-off-by: Giuseppe Scrivano <gscrivan redhat com>
---

I couldn't get tests to pass on F19.  Cole, does it work on your setup as well?

 tests/image-xml/image2guest/image-format-out.xml     |  6 +++---
 tests/image-xml/image2guest/image-xenfv32.xml        |  6 +++---
 tests/image-xml/image2guest/image-xenpv32-kernel.xml |  6 +++---
 tests/image-xml/image2guest/image-xenpv32.xml        |  6 +++---
 tests/xmlconfig-xml/boot-windowsxp-kvm.xml           |  4 ++--
 tests/xmlconfig-xml/install-windowsxp-kvm.xml        |  4 ++--
 tests/xmlparse-xml/add-devices-in.xml                |  2 +-
 tests/xmlparse-xml/change-boot-kernel-in.xml         |  2 +-
 tests/xmlparse-xml/change-boot-kernel-out.xml        |  2 +-
 tests/xmlparse-xml/change-disk-in.xml                | 10 +++++-----
 tests/xmlparse-xml/change-disk-out.xml               | 10 +++++-----
 tests/xmlparse-xml/change-filesystems-in.xml         |  2 +-
 tests/xmlparse-xml/change-filesystems-out.xml        |  2 +-
 tests/xmlparse-xml/change-graphics-in.xml            |  2 +-
 tests/xmlparse-xml/change-graphics-out.xml           |  2 +-
 tests/xmlparse-xml/change-guest-in.xml               |  2 +-
 tests/xmlparse-xml/change-guest-out.xml              |  2 +-
 tests/xmlparse-xml/change-rng-egd-in.xml             |  2 +-
 tests/xmlparse-xml/change-rng-egd-out.xml            |  2 +-
 tests/xmlparse-xml/change-rng-random-in.xml          |  2 +-
 tests/xmlparse-xml/change-rng-random-out.xml         |  2 +-
 tests/xmlparse-xml/change-smartcard-in.xml           |  2 +-
 tests/xmlparse-xml/change-smartcard-out.xml          |  2 +-
 tests/xmlparse-xml/change-sounds-in.xml              |  2 +-
 tests/xmlparse-xml/change-sounds-out.xml             |  2 +-
 tests/xmlparse-xml/change-tpm-in.xml                 |  2 +-
 tests/xmlparse-xml/change-tpm-out.xml                |  2 +-
 tests/xmlparse-xml/change-videos-in.xml              |  2 +-
 tests/xmlparse-xml/change-videos-out.xml             |  2 +-
 tests/xmlparse-xml/change-watchdogs-in.xml           |  2 +-
 tests/xmlparse-xml/change-watchdogs-out.xml          |  2 +-
 tests/xmlparse.py                                    |  4 ++--
 32 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/tests/image-xml/image2guest/image-format-out.xml b/tests/image-xml/image2guest/image-format-out.xml
index b84a04f..da0d873 100644
--- a/tests/image-xml/image2guest/image-format-out.xml
+++ b/tests/image-xml/image2guest/image-format-out.xml
@@ -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"/>
diff --git a/tests/image-xml/image2guest/image-xenfv32.xml b/tests/image-xml/image2guest/image-xenfv32.xml
index 0a0b026..24704ca 100644
--- a/tests/image-xml/image2guest/image-xenfv32.xml
+++ b/tests/image-xml/image2guest/image-xenfv32.xml
@@ -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"/>
diff --git a/tests/image-xml/image2guest/image-xenpv32-kernel.xml b/tests/image-xml/image2guest/image-xenpv32-kernel.xml
index 191614f..e7e5bfe 100644
--- a/tests/image-xml/image2guest/image-xenpv32-kernel.xml
+++ b/tests/image-xml/image2guest/image-xenpv32-kernel.xml
@@ -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"/>
diff --git a/tests/image-xml/image2guest/image-xenpv32.xml b/tests/image-xml/image2guest/image-xenpv32.xml
index 854e8cb..e1fc67f 100644
--- a/tests/image-xml/image2guest/image-xenpv32.xml
+++ b/tests/image-xml/image2guest/image-xenpv32.xml
@@ -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"/>
diff --git a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
index 91cc3d0..2973adf 100644
--- a/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
+++ b/tests/xmlconfig-xml/boot-windowsxp-kvm.xml
@@ -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>
diff --git a/tests/xmlconfig-xml/install-windowsxp-kvm.xml b/tests/xmlconfig-xml/install-windowsxp-kvm.xml
index 21c75fe..7d54eab 100644
--- a/tests/xmlconfig-xml/install-windowsxp-kvm.xml
+++ b/tests/xmlconfig-xml/install-windowsxp-kvm.xml
@@ -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>
diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml
index 9e225f0..b84c3bd 100644
--- a/tests/xmlparse-xml/add-devices-in.xml
+++ b/tests/xmlparse-xml/add-devices-in.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-boot-kernel-in.xml b/tests/xmlparse-xml/change-boot-kernel-in.xml
index 7abd3b5..ffbc280 100644
--- a/tests/xmlparse-xml/change-boot-kernel-in.xml
+++ b/tests/xmlparse-xml/change-boot-kernel-in.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-boot-kernel-out.xml b/tests/xmlparse-xml/change-boot-kernel-out.xml
index 7e8d137..b66c708 100644
--- a/tests/xmlparse-xml/change-boot-kernel-out.xml
+++ b/tests/xmlparse-xml/change-boot-kernel-out.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-disk-in.xml b/tests/xmlparse-xml/change-disk-in.xml
index 720f730..d70d677 100644
--- a/tests/xmlparse-xml/change-disk-in.xml
+++ b/tests/xmlparse-xml/change-disk-in.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml
index 4c2188d..c73cd64 100644
--- a/tests/xmlparse-xml/change-disk-out.xml
+++ b/tests/xmlparse-xml/change-disk-out.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-filesystems-in.xml b/tests/xmlparse-xml/change-filesystems-in.xml
index f0d5a1a..bd1b5ca 100644
--- a/tests/xmlparse-xml/change-filesystems-in.xml
+++ b/tests/xmlparse-xml/change-filesystems-in.xml
@@ -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>
diff --git a/tests/xmlparse-xml/change-filesystems-out.xml b/tests/xmlparse-xml/change-filesystems-out.xml
index 6d0c00c..2329792 100644
--- a/tests/xmlparse-xml/change-filesystems-out.xml
+++ b/tests/xmlparse-xml/change-filesystems-out.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-graphics-in.xml b/tests/xmlparse-xml/change-graphics-in.xml
index 1dc9e2e..55ba017 100644
--- a/tests/xmlparse-xml/change-graphics-in.xml
+++ b/tests/xmlparse-xml/change-graphics-in.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-graphics-out.xml b/tests/xmlparse-xml/change-graphics-out.xml
index 9ce3cb0..6d463b3 100644
--- a/tests/xmlparse-xml/change-graphics-out.xml
+++ b/tests/xmlparse-xml/change-graphics-out.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml
index 298e505..bbba7a4 100644
--- a/tests/xmlparse-xml/change-guest-in.xml
+++ b/tests/xmlparse-xml/change-guest-in.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml
index 71e5424..51c3733 100644
--- a/tests/xmlparse-xml/change-guest-out.xml
+++ b/tests/xmlparse-xml/change-guest-out.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-rng-egd-in.xml b/tests/xmlparse-xml/change-rng-egd-in.xml
index 74db226..8f39585 100644
--- a/tests/xmlparse-xml/change-rng-egd-in.xml
+++ b/tests/xmlparse-xml/change-rng-egd-in.xml
@@ -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'>
diff --git a/tests/xmlparse-xml/change-rng-egd-out.xml b/tests/xmlparse-xml/change-rng-egd-out.xml
index c4bd71e..2121c43 100644
--- a/tests/xmlparse-xml/change-rng-egd-out.xml
+++ b/tests/xmlparse-xml/change-rng-egd-out.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-rng-random-in.xml b/tests/xmlparse-xml/change-rng-random-in.xml
index fb9367d..1beddc1 100644
--- a/tests/xmlparse-xml/change-rng-random-in.xml
+++ b/tests/xmlparse-xml/change-rng-random-in.xml
@@ -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'>
diff --git a/tests/xmlparse-xml/change-rng-random-out.xml b/tests/xmlparse-xml/change-rng-random-out.xml
index 8c3eba4..1f4f04a 100644
--- a/tests/xmlparse-xml/change-rng-random-out.xml
+++ b/tests/xmlparse-xml/change-rng-random-out.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml
index 5033e8e..c07010c 100644
--- a/tests/xmlparse-xml/change-smartcard-in.xml
+++ b/tests/xmlparse-xml/change-smartcard-in.xml
@@ -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'>
diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml
index 72305af..d733f55 100644
--- a/tests/xmlparse-xml/change-smartcard-out.xml
+++ b/tests/xmlparse-xml/change-smartcard-out.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-sounds-in.xml b/tests/xmlparse-xml/change-sounds-in.xml
index 001c50b..dc5365d 100644
--- a/tests/xmlparse-xml/change-sounds-in.xml
+++ b/tests/xmlparse-xml/change-sounds-in.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-sounds-out.xml b/tests/xmlparse-xml/change-sounds-out.xml
index 9d7dd4b..dfd9ddd 100644
--- a/tests/xmlparse-xml/change-sounds-out.xml
+++ b/tests/xmlparse-xml/change-sounds-out.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-tpm-in.xml b/tests/xmlparse-xml/change-tpm-in.xml
index 271dc95..78dd100 100644
--- a/tests/xmlparse-xml/change-tpm-in.xml
+++ b/tests/xmlparse-xml/change-tpm-in.xml
@@ -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'>
diff --git a/tests/xmlparse-xml/change-tpm-out.xml b/tests/xmlparse-xml/change-tpm-out.xml
index a606d48..a5f0682 100644
--- a/tests/xmlparse-xml/change-tpm-out.xml
+++ b/tests/xmlparse-xml/change-tpm-out.xml
@@ -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">
diff --git a/tests/xmlparse-xml/change-videos-in.xml b/tests/xmlparse-xml/change-videos-in.xml
index 76f8806..7dde768 100644
--- a/tests/xmlparse-xml/change-videos-in.xml
+++ b/tests/xmlparse-xml/change-videos-in.xml
@@ -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>
diff --git a/tests/xmlparse-xml/change-videos-out.xml b/tests/xmlparse-xml/change-videos-out.xml
index 142a682..ea357ef 100644
--- a/tests/xmlparse-xml/change-videos-out.xml
+++ b/tests/xmlparse-xml/change-videos-out.xml
@@ -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>
diff --git a/tests/xmlparse-xml/change-watchdogs-in.xml b/tests/xmlparse-xml/change-watchdogs-in.xml
index e9ae34f..fb9bcd1 100644
--- a/tests/xmlparse-xml/change-watchdogs-in.xml
+++ b/tests/xmlparse-xml/change-watchdogs-in.xml
@@ -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"/>
diff --git a/tests/xmlparse-xml/change-watchdogs-out.xml b/tests/xmlparse-xml/change-watchdogs-out.xml
index 58456dd..2b9622d 100644
--- a/tests/xmlparse-xml/change-watchdogs-out.xml
+++ b/tests/xmlparse-xml/change-watchdogs-out.xml
@@ -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"/>
diff --git a/tests/xmlparse.py b/tests/xmlparse.py
index 38838e3..1f01070 100644
--- a/tests/xmlparse.py
+++ b/tests/xmlparse.py
@@ -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)
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]