NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2026-08-13 06:24:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

clitest: Drop explicit fake.iso filename

Browse Source 
Just use one of the other files we stub out
This commit is contained in:
Cole Robinson
2015-04-22 18:00:00 -04:00
parent d4bf3b58a0
commit 8a3e3391c8
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/cli-test-xml/compare/virt-install-location-iso.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<emulator>/usr/bin/qemu-kvm</emulator> <emulator>/usr/bin/qemu-kvm</emulator>
<disk type="file" device="cdrom"> <disk type="file" device="cdrom">
<driver name="qemu"/> <driver name="qemu"/>
<source file="/tmp/fake.iso"/> <source file="/tmp/__virtinst_cli_exist1.img"/>
<target dev="hda" bus="ide"/> <target dev="hda" bus="ide"/>
<readonly/> <readonly/>
</disk> </disk>
tests/clitest.py
+3 -6
View File
@@ -64,12 +64,9 @@ exist_images = [
image_prefix + "exist2.img", image_prefix + "exist2.img",
] ]
# Fake iso for --location iso mounting exist_files = exist_images
fake_iso = ["/tmp/fake.iso"]
exist_files = exist_images + fake_iso
new_files = new_images new_files = new_images
clean_files = (new_images + exist_images + fake_iso) clean_files = (new_images + exist_images)
test_files = { test_files = {
'TESTURI' : utils.testuri, 'TESTURI' : utils.testuri,
@@ -688,7 +685,7 @@ c.add_compare("--arch aarch64 --cdrom %(EXISTIMG2)s --boot loader=CODE.fd,nvram_
c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-pseries-f20") c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-pseries-f20")
c.add_compare("--arch ppc64 --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-machdefault-f20") c.add_compare("--arch ppc64 --boot network --disk %(EXISTIMG1)s --os-variant fedora20 --network none", "ppc64-machdefault-f20")
c.add_compare("--arch aarch64 --nodisks", "aarch64-default-uefi") # ensure aarch64 defaults to UEFI c.add_compare("--arch aarch64 --nodisks", "aarch64-default-uefi") # ensure aarch64 defaults to UEFI
c.add_compare("--disk none --location /tmp/fake.iso --nonetworks", "location-iso") # Using --location iso mounting c.add_compare("--disk none --location %(EXISTIMG3)s --nonetworks", "location-iso") # Using --location iso mounting
c.add_compare("--disk %(EXISTIMG1)s --pxe --os-variant rhel6.4", "kvm-rhel6") # RHEL6 defaults c.add_compare("--disk %(EXISTIMG1)s --pxe --os-variant rhel6.4", "kvm-rhel6") # RHEL6 defaults
c.add_compare("--disk %(EXISTIMG1)s --pxe --os-variant rhel7.0", "kvm-rhel7") # RHEL7 defaults c.add_compare("--disk %(EXISTIMG1)s --pxe --os-variant rhel7.0", "kvm-rhel7") # RHEL7 defaults
c.add_compare("--disk %(EXISTIMG1)s --pxe --os-variant centos7.0", "kvm-centos7") # Centos 7 defaults c.add_compare("--disk %(EXISTIMG1)s --pxe --os-variant centos7.0", "kvm-centos7") # Centos 7 defaults