diff --git a/tests/cli-test-xml/clone-disk-managed.xml b/tests/cli-test-xml/clone-disk-managed.xml index 20181112a..8fe1fe2d2 100644 --- a/tests/cli-test-xml/clone-disk-managed.xml +++ b/tests/cli-test-xml/clone-disk-managed.xml @@ -15,7 +15,7 @@ - + diff --git a/tests/cli-test-xml/compare/clone-auto1.xml b/tests/cli-test-xml/compare/clone-auto1.xml index 1c90162e6..9fbc1201d 100644 --- a/tests/cli-test-xml/compare/clone-auto1.xml +++ b/tests/cli-test-xml/compare/clone-auto1.xml @@ -21,12 +21,12 @@ /usr/lib/xen/bin/qemu-dm - +
- +
@@ -38,19 +38,19 @@ - +
- +
- +
diff --git a/tests/cli-test-xml/compare/clone-auto2.xml b/tests/cli-test-xml/compare/clone-auto2.xml index 0fe424d14..5504cee58 100644 --- a/tests/cli-test-xml/compare/clone-auto2.xml +++ b/tests/cli-test-xml/compare/clone-auto2.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - +
diff --git a/tests/cli-test-xml/compare/many-devices.xml b/tests/cli-test-xml/compare/many-devices.xml index 2dccb2a07..390c22e96 100644 --- a/tests/cli-test-xml/compare/many-devices.xml +++ b/tests/cli-test-xml/compare/many-devices.xml @@ -26,7 +26,7 @@ /usr/bin/test-hv - + WD-WMAP9A966149 @@ -114,7 +114,7 @@ /usr/bin/test-hv - + WD-WMAP9A966149 diff --git a/tests/clitest.py b/tests/clitest.py index 7dbbc929e..b29bb54e0 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -113,14 +113,14 @@ test_files = { 'VOL' : "testvol1.img", 'DIR' : os.getcwd(), 'TREEDIR' : treedir, - 'MANAGEDEXIST1' : "/default-pool/testvol1.img", - 'MANAGEDEXIST2' : "/default-pool/testvol2.img", - 'MANAGEDEXISTUPPER' : "/default-pool/UPPER", - 'MANAGEDNEW1' : "/default-pool/clonevol", - 'MANAGEDNEW2' : "/default-pool/clonevol", - 'MANAGEDDISKNEW1' : "/disk-pool/newvol1.img", - 'COLLIDE' : "/default-pool/collidevol1.img", - 'SHARE' : "/default-pool/sharevol.img", + 'MANAGEDEXIST1' : "/dev/default-pool/testvol1.img", + 'MANAGEDEXIST2' : "/dev/default-pool/testvol2.img", + 'MANAGEDEXISTUPPER' : "/dev/default-pool/UPPER", + 'MANAGEDNEW1' : "/dev/default-pool/clonevol", + 'MANAGEDNEW2' : "/dev/default-pool/clonevol", + 'MANAGEDDISKNEW1' : "/dev/disk-pool/newvol1.img", + 'COLLIDE' : "/dev/default-pool/collidevol1.img", + 'SHARE' : "/dev/default-pool/sharevol.img", 'VIRTCONV_OUT' : "%s/test.out" % virtconv_out, 'VC_IMG1' : "%s/virtimage/test1.virt-image" % vcdir, @@ -750,7 +750,7 @@ vclon.add_valid("misc", "-o test --auto-clone") # Auto flag, no storage vclon.add_valid("misc", "--original-xml %(CLONE_DISK_XML)s --auto-clone") # Auto flag w/ storage, vclon.add_valid("misc", "--original-xml %(CLONE_STORAGE_XML)s --auto-clone") # Auto flag w/ managed storage, vclon.add_valid("misc", "-o test-for-clone --auto-clone --clone-running") # Auto flag, actual VM, skip state check -vclon.add_valid("misc", "-o test-clone-simple -n newvm --preserve-data --file /default-pool/default-vol --clone-running --force") # Preserve data shouldn't complain about existing volume +vclon.add_valid("misc", "-o test-clone-simple -n newvm --preserve-data --file /dev/default-pool/default-vol --clone-running --force") # Preserve data shouldn't complain about existing volume vclon.add_invalid("misc", "--auto-clone# Auto flag, actual VM, without state skip ") # Just the auto flag vclon.add_invalid("misc", "-o test-for-clone --auto-clone") diff --git a/tests/clone-xml/cross-pool-in.xml b/tests/clone-xml/cross-pool-in.xml index f6f006374..6177a6f92 100644 --- a/tests/clone-xml/cross-pool-in.xml +++ b/tests/clone-xml/cross-pool-in.xml @@ -18,11 +18,11 @@ /usr/bin/qemu-kvm - + - + diff --git a/tests/clone-xml/cross-pool-out.xml b/tests/clone-xml/cross-pool-out.xml index 4fac96b0c..4200dce07 100644 --- a/tests/clone-xml/cross-pool-out.xml +++ b/tests/clone-xml/cross-pool-out.xml @@ -18,11 +18,11 @@ /usr/bin/qemu-kvm - + - + diff --git a/tests/clone-xml/empty-disks-out.xml b/tests/clone-xml/empty-disks-out.xml index 546a93046..318f08d9d 100644 --- a/tests/clone-xml/empty-disks-out.xml +++ b/tests/clone-xml/empty-disks-out.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/clone-xml/force-out.xml b/tests/clone-xml/force-out.xml index 0375f39e5..4a041a234 100644 --- a/tests/clone-xml/force-out.xml +++ b/tests/clone-xml/force-out.xml @@ -18,7 +18,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/clone-xml/general-cfg-out.xml b/tests/clone-xml/general-cfg-out.xml index 361ca749f..05a17738b 100644 --- a/tests/clone-xml/general-cfg-out.xml +++ b/tests/clone-xml/general-cfg-out.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/clone-xml/managed-storage-in.xml b/tests/clone-xml/managed-storage-in.xml index 616a8d885..8cac51eea 100644 --- a/tests/clone-xml/managed-storage-in.xml +++ b/tests/clone-xml/managed-storage-in.xml @@ -19,11 +19,11 @@ /usr/bin/qemu-kvm - + - + diff --git a/tests/clone-xml/managed-storage-out.xml b/tests/clone-xml/managed-storage-out.xml index 3f172cb89..540f8d7a1 100644 --- a/tests/clone-xml/managed-storage-out.xml +++ b/tests/clone-xml/managed-storage-out.xml @@ -19,11 +19,11 @@ /usr/bin/qemu-kvm - + - + diff --git a/tests/clone-xml/readonly-disks-out.xml b/tests/clone-xml/readonly-disks-out.xml index 93933feb5..83e1b385a 100644 --- a/tests/clone-xml/readonly-disks-out.xml +++ b/tests/clone-xml/readonly-disks-out.xml @@ -19,7 +19,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/clone-xml/skip-out.xml b/tests/clone-xml/skip-out.xml index baa41e49f..01ba3e6f7 100644 --- a/tests/clone-xml/skip-out.xml +++ b/tests/clone-xml/skip-out.xml @@ -29,7 +29,7 @@ - + diff --git a/tests/clonetest.py b/tests/clonetest.py index 11370654d..bd8ddb299 100644 --- a/tests/clonetest.py +++ b/tests/clonetest.py @@ -28,14 +28,14 @@ CLONE_NAME = "clone-new" # Create some files to use as test images FILE1 = "/tmp/virtinst-test1.img" FILE2 = "/tmp/virtinst-test2.img" -P1_VOL1 = "/default-pool/testvol1.img" -P1_VOL2 = "/default-pool/testvol2.img" -P2_VOL1 = "/cross-pool/testvol1.img" -P2_VOL2 = "/cross-pool/testvol2.img" +P1_VOL1 = "/dev/default-pool/testvol1.img" +P1_VOL2 = "/dev/default-pool/testvol2.img" +P2_VOL1 = "/dev/cross-pool/testvol1.img" +P2_VOL2 = "/dev/cross-pool/testvol2.img" -POOL1 = "/default-pool" -POOL2 = "/cross-pool" -DISKPOOL = "/disk-pool" +POOL1 = "/dev/default-pool" +POOL2 = "/dev/cross-pool" +DISKPOOL = "/dev/disk-pool" local_files = [FILE1, FILE2] @@ -92,7 +92,7 @@ class TestClone(unittest.TestCase): cloneobj.clone_macs = ["22:23:45:67:89:00", "22:23:45:67:89:01"] if disks is None: - disks = ["/disk-pool/disk-vol1", "/tmp/clone2.img", + disks = ["/dev/disk-pool/disk-vol1", "/tmp/clone2.img", "/tmp/clone3.img", "/tmp/clone4.img", "/tmp/clone5.img", None] @@ -179,14 +179,14 @@ class TestClone(unittest.TestCase): def testCloneStorageForce(self): base = "force" self._clone_helper(base, - disks=["/default-pool/1234.img", + disks=["/dev/default-pool/1234.img", None, "/tmp/clone2.img"], force_list=["hda", "fdb", "sdb"]) def testCloneStorageSkip(self): base = "skip" self._clone_helper(base, - disks=["/default-pool/1234.img", + disks=["/dev/default-pool/1234.img", None, "/tmp/clone2.img"], skip_list=["hda", "fdb"]) @@ -203,9 +203,9 @@ class TestClone(unittest.TestCase): def testCloneManagedToUnmanaged(self): base = "managed-storage" - # We are trying to clone from a pool (/default-pool) to unmanaged + # We are trying to clone from a pool (/dev/default-pool) to unmanaged # storage. For this case, the cloning needs to fail back to manual - # operation (no libvirt calls), but since /default-pool doesn't exist, + # operation (no libvirt calls), but since /dev/default-pool doesn't exist, # this should fail. try: self._clone_helper(base, ["/tmp/new1.img", "/tmp/new2.img"], diff --git a/tests/storage-xml/pool-logical-volclone.xml b/tests/storage-xml/pool-logical-volclone.xml index ef53c6ccd..5e6b4ff02 100644 --- a/tests/storage-xml/pool-logical-volclone.xml +++ b/tests/storage-xml/pool-logical-volclone.xml @@ -1,13 +1,13 @@ pool-logical-volclone - /some/target/path/pool-logical-vol + /dev/pool-logical/pool-logical-vol 10737418240 10737418240 - /some/target/path/pool-logical-vol + /dev/pool-logical/pool-logical-vol 0700 10736 diff --git a/tests/storage-xml/pool-logical.xml b/tests/storage-xml/pool-logical.xml index 092a2ead1..8cfcb930d 100644 --- a/tests/storage-xml/pool-logical.xml +++ b/tests/storage-xml/pool-logical.xml @@ -6,6 +6,6 @@ pool-logical - /some/target/path + /dev/pool-logical diff --git a/tests/storage.py b/tests/storage.py index 0b52fe851..f680c318f 100644 --- a/tests/storage.py +++ b/tests/storage.py @@ -158,7 +158,8 @@ class TestStorage(unittest.TestCase): def testLVPool(self): poolobj = createPool(self.conn, StoragePool.TYPE_LOGICAL, - "pool-logical") + "pool-logical", + target_path="/dev/pool-logical") invol = createVol(self.conn, poolobj) createVol(self.conn, poolobj, volname=invol.name() + "input", input_vol=invol) diff --git a/tests/testdriver.xml b/tests/testdriver.xml index 876a5b973..7ee634fdd 100644 --- a/tests/testdriver.xml +++ b/tests/testdriver.xml @@ -323,7 +323,7 @@ /usr/lib/xen/bin/qemu-dm - + @@ -367,7 +367,7 @@ /usr/lib/xen/bin/qemu-dm - + @@ -401,12 +401,12 @@ /usr/lib/xen/bin/qemu-dm - + - + @@ -414,18 +414,18 @@ - + - + - + @@ -757,7 +757,7 @@ - /default-pool + /dev/default-pool 0700 10736 @@ -955,7 +955,7 @@ - /cross-pool + /dev/cross-pool 0700 10736 @@ -1074,7 +1074,7 @@ - /disk-pool + /dev/disk-pool 0700 10736 diff --git a/tests/utils.py b/tests/utils.py index c2746ae69..df52c9af8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -224,7 +224,7 @@ def make_import_installer(): return virtinst.ImportInstaller(_conn) -def make_distro_installer(location="/default-pool/default-vol"): +def make_distro_installer(location="/dev/default-pool/default-vol"): inst = virtinst.DistroInstaller(_conn) inst.location = location return inst @@ -255,7 +255,7 @@ def build_win_kvm(path=None, fake=True): def get_floppy(path=None): if not path: - path = "/default-pool/testvol1.img" + path = "/dev/default-pool/testvol1.img" d = VirtualDisk(_conn) d.path = path d.device = d.DEVICE_FLOPPY diff --git a/tests/xmlconfig-xml/boot-many-devices.xml b/tests/xmlconfig-xml/boot-many-devices.xml index 6249bb1a6..c1150dfb7 100644 --- a/tests/xmlconfig-xml/boot-many-devices.xml +++ b/tests/xmlconfig-xml/boot-many-devices.xml @@ -37,7 +37,7 @@ - +
diff --git a/tests/xmlconfig-xml/install-f11-ac97.xml b/tests/xmlconfig-xml/install-f11-ac97.xml index 2c4d7f6d5..d8430bf85 100644 --- a/tests/xmlconfig-xml/install-f11-ac97.xml +++ b/tests/xmlconfig-xml/install-f11-ac97.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/install-f11-noac97.xml b/tests/xmlconfig-xml/install-f11-noac97.xml index 638480284..4e2ea552b 100644 --- a/tests/xmlconfig-xml/install-f11-noac97.xml +++ b/tests/xmlconfig-xml/install-f11-noac97.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/install-f11-qemu.xml b/tests/xmlconfig-xml/install-f11-qemu.xml index 3fd6197ed..e33f01b84 100644 --- a/tests/xmlconfig-xml/install-f11-qemu.xml +++ b/tests/xmlconfig-xml/install-f11-qemu.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/install-f11-rheldefaults.xml b/tests/xmlconfig-xml/install-f11-rheldefaults.xml index 666eebc80..829f31358 100644 --- a/tests/xmlconfig-xml/install-f11-rheldefaults.xml +++ b/tests/xmlconfig-xml/install-f11-rheldefaults.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/install-f11-xen.xml b/tests/xmlconfig-xml/install-f11-xen.xml index 93f08181b..a7552f7a1 100644 --- a/tests/xmlconfig-xml/install-f11-xen.xml +++ b/tests/xmlconfig-xml/install-f11-xen.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/install-f11.xml b/tests/xmlconfig-xml/install-f11.xml index b5719fa67..47754a2ae 100644 --- a/tests/xmlconfig-xml/install-f11.xml +++ b/tests/xmlconfig-xml/install-f11.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml index 872737936..0851a9d73 100644 --- a/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml +++ b/tests/xmlconfig-xml/misc-qemu-driver-overwrite.xml @@ -22,7 +22,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml index 6e44c2bb0..1e0eaa72a 100644 --- a/tests/xmlconfig-xml/misc-qemu-iso-disk.xml +++ b/tests/xmlconfig-xml/misc-qemu-iso-disk.xml @@ -22,7 +22,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml index f3a49b7c2..60a4ecbe7 100644 --- a/tests/xmlconfig-xml/rhel6-kvm-stage1.xml +++ b/tests/xmlconfig-xml/rhel6-kvm-stage1.xml @@ -22,12 +22,12 @@ /usr/lib/xen/bin/qemu-dm - + - + diff --git a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml index 94c40dd4b..a831d3ed3 100644 --- a/tests/xmlconfig-xml/rhel6-kvm-stage2.xml +++ b/tests/xmlconfig-xml/rhel6-kvm-stage2.xml @@ -20,12 +20,12 @@ /usr/lib/xen/bin/qemu-dm - + - + diff --git a/tests/xmlconfig-xml/winxp-kvm-stage1.xml b/tests/xmlconfig-xml/winxp-kvm-stage1.xml index e76aa9856..68d1a10cf 100644 --- a/tests/xmlconfig-xml/winxp-kvm-stage1.xml +++ b/tests/xmlconfig-xml/winxp-kvm-stage1.xml @@ -21,7 +21,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/winxp-kvm-stage2.xml b/tests/xmlconfig-xml/winxp-kvm-stage2.xml index 6f5650199..7f54ce875 100644 --- a/tests/xmlconfig-xml/winxp-kvm-stage2.xml +++ b/tests/xmlconfig-xml/winxp-kvm-stage2.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig-xml/winxp-kvm-stage3.xml b/tests/xmlconfig-xml/winxp-kvm-stage3.xml index ec57c1015..09e828b0e 100644 --- a/tests/xmlconfig-xml/winxp-kvm-stage3.xml +++ b/tests/xmlconfig-xml/winxp-kvm-stage3.xml @@ -20,7 +20,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py index 74a62921d..b4c279732 100644 --- a/tests/xmlconfig.py +++ b/tests/xmlconfig.py @@ -372,11 +372,11 @@ class TestXMLConfig(unittest.TestCase): self._compare(g, "misc-qemu-driver-type", True) g = utils.get_basic_fullyvirt_guest() - g.add_device(utils.get_filedisk("/default-pool/iso-vol")) + g.add_device(utils.get_filedisk("/dev/default-pool/iso-vol")) self._compare(g, "misc-qemu-iso-disk", True) g = utils.get_basic_fullyvirt_guest() - g.add_device(utils.get_filedisk("/default-pool/iso-vol")) + g.add_device(utils.get_filedisk("/dev/default-pool/iso-vol")) g.get_devices("disk")[0].driver_type = "qcow2" self._compare(g, "misc-qemu-driver-overwrite", True) @@ -483,17 +483,17 @@ class TestXMLConfig(unittest.TestCase): def testInstallWindowsKVM(self): utils.set_conn(_plainkvm) - g = utils.build_win_kvm("/default-pool/winxp.img") + g = utils.build_win_kvm("/dev/default-pool/winxp.img") self._compare(g, "winxp-kvm-stage1", True) def testContinueWindowsKVM(self): utils.set_conn(_plainkvm) - g = utils.build_win_kvm("/default-pool/winxp.img") + g = utils.build_win_kvm("/dev/default-pool/winxp.img") self._compare(g, "winxp-kvm-stage2", True, True) def testBootWindowsKVM(self): utils.set_conn(_plainkvm) - g = utils.build_win_kvm("/default-pool/winxp.img") + g = utils.build_win_kvm("/dev/default-pool/winxp.img") self._compare(g, "winxp-kvm-stage3", False) @@ -737,7 +737,7 @@ class TestXMLConfig(unittest.TestCase): g.add_device(d) d = VirtualDisk(g.conn) - d.path = "/default-pool/testvol1.img" + d.path = "/dev/default-pool/testvol1.img" d.bus = "scsi" d.driver_name = "qemu" d.address.type = "spapr-vio" @@ -921,7 +921,7 @@ class TestXMLConfig(unittest.TestCase): location="tests/cli-test-xml/fakerhel6tree") g = utils.get_basic_fullyvirt_guest("kvm", installer=i) g.add_device(utils.get_floppy()) - g.add_device(utils.get_filedisk("/default-pool/rhel6.img", fake=False)) + g.add_device(utils.get_filedisk("/dev/default-pool/rhel6.img", fake=False)) g.add_device(utils.get_blkdisk()) g.add_device(utils.get_virtual_network()) g.add_device(VirtualAudio(g.conn)) @@ -932,7 +932,7 @@ class TestXMLConfig(unittest.TestCase): def testFullKVMWinxp(self): utils.set_conn(_plainkvm) - g = utils.build_win_kvm("/default-pool/winxp.img", fake=False) + g = utils.build_win_kvm("/dev/default-pool/winxp.img", fake=False) self._testInstall(g, "winxp-kvm-stage1", "winxp-kvm-stage3", "winxp-kvm-stage2") @@ -1019,7 +1019,7 @@ class TestXMLConfig(unittest.TestCase): def testManyVirtio(self): d = VirtualDisk(utils.get_conn()) d.bus = "virtio" - d.path = "/default-pool/testvol1.img" + d.path = "/dev/default-pool/testvol1.img" targetlist = [] for ignore in range(0, (26 * 2) + 1): diff --git a/tests/xmlparse-xml/add-devices-in.xml b/tests/xmlparse-xml/add-devices-in.xml index e733c7586..9e225f05d 100644 --- a/tests/xmlparse-xml/add-devices-in.xml +++ b/tests/xmlparse-xml/add-devices-in.xml @@ -19,7 +19,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/add-devices-out.xml b/tests/xmlparse-xml/add-devices-out.xml index 24d48bcb0..6c3b7dd28 100644 --- a/tests/xmlparse-xml/add-devices-out.xml +++ b/tests/xmlparse-xml/add-devices-out.xml @@ -19,7 +19,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-disk-out.xml b/tests/xmlparse-xml/change-disk-out.xml index 6702201d7..135715f62 100644 --- a/tests/xmlparse-xml/change-disk-out.xml +++ b/tests/xmlparse-xml/change-disk-out.xml @@ -51,7 +51,7 @@ 6 - + diff --git a/tests/xmlparse-xml/change-guest-in.xml b/tests/xmlparse-xml/change-guest-in.xml index b6ab49c51..ab56c03d2 100644 --- a/tests/xmlparse-xml/change-guest-in.xml +++ b/tests/xmlparse-xml/change-guest-in.xml @@ -29,7 +29,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-guest-out.xml b/tests/xmlparse-xml/change-guest-out.xml index eb3dd42a2..ca350b1cf 100644 --- a/tests/xmlparse-xml/change-guest-out.xml +++ b/tests/xmlparse-xml/change-guest-out.xml @@ -31,7 +31,7 @@ /usr/binnnn/fooemu - + diff --git a/tests/xmlparse-xml/change-media-out.xml b/tests/xmlparse-xml/change-media-out.xml index 878fc2231..3849d6bb5 100644 --- a/tests/xmlparse-xml/change-media-out.xml +++ b/tests/xmlparse-xml/change-media-out.xml @@ -13,27 +13,27 @@ - + - + - + - + - + diff --git a/tests/xmlparse-xml/change-smartcard-in.xml b/tests/xmlparse-xml/change-smartcard-in.xml index 944f03e00..5033e8e00 100644 --- a/tests/xmlparse-xml/change-smartcard-in.xml +++ b/tests/xmlparse-xml/change-smartcard-in.xml @@ -26,7 +26,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-smartcard-out.xml b/tests/xmlparse-xml/change-smartcard-out.xml index 91b9d4faf..72305af30 100644 --- a/tests/xmlparse-xml/change-smartcard-out.xml +++ b/tests/xmlparse-xml/change-smartcard-out.xml @@ -26,7 +26,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-tpm-in.xml b/tests/xmlparse-xml/change-tpm-in.xml index 24aa998ac..271dc9559 100644 --- a/tests/xmlparse-xml/change-tpm-in.xml +++ b/tests/xmlparse-xml/change-tpm-in.xml @@ -26,7 +26,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse-xml/change-tpm-out.xml b/tests/xmlparse-xml/change-tpm-out.xml index b97a95ab6..a606d480e 100644 --- a/tests/xmlparse-xml/change-tpm-out.xml +++ b/tests/xmlparse-xml/change-tpm-out.xml @@ -26,7 +26,7 @@ /usr/lib/xen/bin/qemu-dm - + diff --git a/tests/xmlparse.py b/tests/xmlparse.py index 5381d92b5..00eae625d 100644 --- a/tests/xmlparse.py +++ b/tests/xmlparse.py @@ -281,7 +281,7 @@ class XMLParseTest(unittest.TestCase): check("error_policy", "stop", None) check = self._make_checker(disk6) - check("path", None, "/default-pool/default-vol") + check("path", None, "/dev/default-pool/default-vol") disk6.sync_path_props() check("shareable", False, True) check("driver_cache", None, "writeback") @@ -760,28 +760,28 @@ class XMLParseTest(unittest.TestCase): disk = guest.get_devices("disk")[0] check = self._make_checker(disk) - check("path", None, "/default-pool/default-vol") + check("path", None, "/dev/default-pool/default-vol") disk.sync_path_props() disk = guest.get_devices("disk")[1] check = self._make_checker(disk) - check("path", None, "/default-pool/default-vol") - check("path", "/default-pool/default-vol", "/disk-pool/diskvol1") + check("path", None, "/dev/default-pool/default-vol") + check("path", "/dev/default-pool/default-vol", "/dev/disk-pool/diskvol1") disk.sync_path_props() disk = guest.get_devices("disk")[2] check = self._make_checker(disk) - check("path", None, "/disk-pool/diskvol1") + check("path", None, "/dev/disk-pool/diskvol1") disk.sync_path_props() disk = guest.get_devices("disk")[3] check = self._make_checker(disk) - check("path", None, "/default-pool/default-vol") + check("path", None, "/dev/default-pool/default-vol") disk.sync_path_props() disk = guest.get_devices("disk")[4] check = self._make_checker(disk) - check("path", None, "/disk-pool/diskvol1") + check("path", None, "/dev/disk-pool/diskvol1") disk.sync_path_props() self._alter_compare(guest.get_xml_config(), outfile)