diff --git a/setup.py b/setup.py index cc7765984..7db0439f7 100755 --- a/setup.py +++ b/setup.py @@ -516,18 +516,18 @@ class TestCommand(TestBaseCommand): ''' Finds all the tests modules in tests/, and runs them. ''' - excludes = ["dist.py", "test_urls.py", "test_inject.py"] + excludes = ["test_dist.py", "test_urls.py", "test_inject.py"] testfiles = self._find_tests_in_dir("tests", excludes) - # Put clitest at the end, since it takes the longest + # Put test_cli at the end, since it takes the longest for f in testfiles[:]: - if "clitest" in f: + if "test_cli" in f: testfiles.remove(f) testfiles.append(f) - # Always want to put checkprops at the end to get accurate results + # Always want to put test_checkprops at the end to get accurate results for f in testfiles[:]: - if "checkprops" in f: + if "test_checkprops" in f: testfiles.remove(f) if not self.testfile: testfiles.append(f) @@ -593,7 +593,7 @@ class TestDist(TestBaseCommand): description = "Tests to run before cutting a release" def run(self): - self._testfiles = ["tests.dist"] + self._testfiles = ["tests.test_dist"] TestBaseCommand.run(self) diff --git a/tests/data/clitest/admin-password.txt b/tests/data/cli/admin-password.txt similarity index 100% rename from tests/data/clitest/admin-password.txt rename to tests/data/cli/admin-password.txt diff --git a/tests/data/clitest/clone-disk-managed.xml b/tests/data/cli/clone-disk-managed.xml similarity index 100% rename from tests/data/clitest/clone-disk-managed.xml rename to tests/data/cli/clone-disk-managed.xml diff --git a/tests/data/clitest/clone-disk-noexist.xml b/tests/data/cli/clone-disk-noexist.xml similarity index 100% rename from tests/data/clitest/clone-disk-noexist.xml rename to tests/data/cli/clone-disk-noexist.xml diff --git a/tests/data/clitest/clone-disk.xml b/tests/data/cli/clone-disk.xml similarity index 100% rename from tests/data/clitest/clone-disk.xml rename to tests/data/cli/clone-disk.xml diff --git a/tests/data/clitest/clone-nvram-auto.xml b/tests/data/cli/clone-nvram-auto.xml similarity index 100% rename from tests/data/clitest/clone-nvram-auto.xml rename to tests/data/cli/clone-nvram-auto.xml diff --git a/tests/data/clitest/cloudinit/meta-data.txt b/tests/data/cli/cloudinit/meta-data.txt similarity index 100% rename from tests/data/clitest/cloudinit/meta-data.txt rename to tests/data/cli/cloudinit/meta-data.txt diff --git a/tests/data/clitest/cloudinit/ssh-key.txt b/tests/data/cli/cloudinit/ssh-key.txt similarity index 100% rename from tests/data/clitest/cloudinit/ssh-key.txt rename to tests/data/cli/cloudinit/ssh-key.txt diff --git a/tests/data/clitest/cloudinit/user-data.txt b/tests/data/cli/cloudinit/user-data.txt similarity index 100% rename from tests/data/clitest/cloudinit/user-data.txt rename to tests/data/cli/cloudinit/user-data.txt diff --git a/tests/data/clitest/compare/virt-clone-clone-auto1.xml b/tests/data/cli/compare/virt-clone-clone-auto1.xml similarity index 100% rename from tests/data/clitest/compare/virt-clone-clone-auto1.xml rename to tests/data/cli/compare/virt-clone-clone-auto1.xml diff --git a/tests/data/clitest/compare/virt-clone-clone-auto2.xml b/tests/data/cli/compare/virt-clone-clone-auto2.xml similarity index 100% rename from tests/data/clitest/compare/virt-clone-clone-auto2.xml rename to tests/data/cli/compare/virt-clone-clone-auto2.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-cdrom.xml b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-cdrom.xml rename to tests/data/cli/compare/virt-install-aarch64-cdrom.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-firmware-no-override.xml b/tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-firmware-no-override.xml rename to tests/data/cli/compare/virt-install-aarch64-firmware-no-override.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-graphics.xml b/tests/data/cli/compare/virt-install-aarch64-graphics.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-graphics.xml rename to tests/data/cli/compare/virt-install-aarch64-graphics.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-headless.xml b/tests/data/cli/compare/virt-install-aarch64-headless.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-headless.xml rename to tests/data/cli/compare/virt-install-aarch64-headless.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-kvm-gic.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-kvm-gic.xml rename to tests/data/cli/compare/virt-install-aarch64-kvm-gic.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-kvm-import.xml b/tests/data/cli/compare/virt-install-aarch64-kvm-import.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-kvm-import.xml rename to tests/data/cli/compare/virt-install-aarch64-kvm-import.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-machdefault.xml b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-machdefault.xml rename to tests/data/cli/compare/virt-install-aarch64-machdefault.xml diff --git a/tests/data/clitest/compare/virt-install-aarch64-machvirt.xml b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-aarch64-machvirt.xml rename to tests/data/cli/compare/virt-install-aarch64-machvirt.xml diff --git a/tests/data/clitest/compare/virt-install-arm-defaultmach-f20.xml b/tests/data/cli/compare/virt-install-arm-defaultmach-f20.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-arm-defaultmach-f20.xml rename to tests/data/cli/compare/virt-install-arm-defaultmach-f20.xml diff --git a/tests/data/clitest/compare/virt-install-arm-kvm-import.xml b/tests/data/cli/compare/virt-install-arm-kvm-import.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-arm-kvm-import.xml rename to tests/data/cli/compare/virt-install-arm-kvm-import.xml diff --git a/tests/data/clitest/compare/virt-install-arm-vexpress-plain.xml b/tests/data/cli/compare/virt-install-arm-vexpress-plain.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-arm-vexpress-plain.xml rename to tests/data/cli/compare/virt-install-arm-vexpress-plain.xml diff --git a/tests/data/clitest/compare/virt-install-arm-virt-f20.xml b/tests/data/cli/compare/virt-install-arm-virt-f20.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-arm-virt-f20.xml rename to tests/data/cli/compare/virt-install-arm-virt-f20.xml diff --git a/tests/data/clitest/compare/virt-install-boot-loader-secure.xml b/tests/data/cli/compare/virt-install-boot-loader-secure.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-boot-loader-secure.xml rename to tests/data/cli/compare/virt-install-boot-loader-secure.xml diff --git a/tests/data/clitest/compare/virt-install-boot-uefi.xml b/tests/data/cli/compare/virt-install-boot-uefi.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-boot-uefi.xml rename to tests/data/cli/compare/virt-install-boot-uefi.xml diff --git a/tests/data/clitest/compare/virt-install-cdrom-centos-label.xml b/tests/data/cli/compare/virt-install-cdrom-centos-label.xml similarity index 98% rename from tests/data/clitest/compare/virt-install-cdrom-centos-label.xml rename to tests/data/cli/compare/virt-install-cdrom-centos-label.xml index 3fbea52aa..95f4a2fdf 100644 --- a/tests/data/clitest/compare/virt-install-cdrom-centos-label.xml +++ b/tests/data/cli/compare/virt-install-cdrom-centos-label.xml @@ -39,7 +39,7 @@ - + diff --git a/tests/data/clitest/compare/virt-install-cdrom-double.xml b/tests/data/cli/compare/virt-install-cdrom-double.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cdrom-double.xml rename to tests/data/cli/compare/virt-install-cdrom-double.xml diff --git a/tests/data/clitest/compare/virt-install-cdrom-url.xml b/tests/data/cli/compare/virt-install-cdrom-url.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cdrom-url.xml rename to tests/data/cli/compare/virt-install-cdrom-url.xml diff --git a/tests/data/clitest/compare/virt-install-cloud-init-default.xml b/tests/data/cli/compare/virt-install-cloud-init-default.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cloud-init-default.xml rename to tests/data/cli/compare/virt-install-cloud-init-default.xml diff --git a/tests/data/clitest/compare/virt-install-cloud-init-options.xml b/tests/data/cli/compare/virt-install-cloud-init-options.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cloud-init-options.xml rename to tests/data/cli/compare/virt-install-cloud-init-options.xml diff --git a/tests/data/clitest/compare/virt-install-cpu-disable-sec.xml b/tests/data/cli/compare/virt-install-cpu-disable-sec.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cpu-disable-sec.xml rename to tests/data/cli/compare/virt-install-cpu-disable-sec.xml diff --git a/tests/data/clitest/compare/virt-install-cpu-rhel7-default.xml b/tests/data/cli/compare/virt-install-cpu-rhel7-default.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cpu-rhel7-default.xml rename to tests/data/cli/compare/virt-install-cpu-rhel7-default.xml diff --git a/tests/data/clitest/compare/virt-install-cpuset-auto.xml b/tests/data/cli/compare/virt-install-cpuset-auto.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-cpuset-auto.xml rename to tests/data/cli/compare/virt-install-cpuset-auto.xml diff --git a/tests/data/clitest/compare/virt-install-default-f27.xml b/tests/data/cli/compare/virt-install-default-f27.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-default-f27.xml rename to tests/data/cli/compare/virt-install-default-f27.xml diff --git a/tests/data/clitest/compare/virt-install-default.xml b/tests/data/cli/compare/virt-install-default.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-default.xml rename to tests/data/cli/compare/virt-install-default.xml diff --git a/tests/data/clitest/compare/virt-install-f21-kvm-remote.xml b/tests/data/cli/compare/virt-install-f21-kvm-remote.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-f21-kvm-remote.xml rename to tests/data/cli/compare/virt-install-f21-kvm-remote.xml diff --git a/tests/data/clitest/compare/virt-install-fake-ftp.xml b/tests/data/cli/compare/virt-install-fake-ftp.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-fake-ftp.xml rename to tests/data/cli/compare/virt-install-fake-ftp.xml diff --git a/tests/data/clitest/compare/virt-install-fake-http.xml b/tests/data/cli/compare/virt-install-fake-http.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-fake-http.xml rename to tests/data/cli/compare/virt-install-fake-http.xml diff --git a/tests/data/clitest/compare/virt-install-fs-default.xml b/tests/data/cli/compare/virt-install-fs-default.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-fs-default.xml rename to tests/data/cli/compare/virt-install-fs-default.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-centos7.xml b/tests/data/cli/compare/virt-install-kvm-centos7.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-centos7.xml rename to tests/data/cli/compare/virt-install-kvm-centos7.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-cpu-default-fallback.xml b/tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-cpu-default-fallback.xml rename to tests/data/cli/compare/virt-install-kvm-cpu-default-fallback.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-fedoralatest-url.xml b/tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-fedoralatest-url.xml rename to tests/data/cli/compare/virt-install-kvm-fedoralatest-url.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-hostcopy-fallback.xml b/tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-hostcopy-fallback.xml rename to tests/data/cli/compare/virt-install-kvm-hostcopy-fallback.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-i686-uefi.xml b/tests/data/cli/compare/virt-install-kvm-i686-uefi.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-i686-uefi.xml rename to tests/data/cli/compare/virt-install-kvm-i686-uefi.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-rhel5.xml b/tests/data/cli/compare/virt-install-kvm-rhel5.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-rhel5.xml rename to tests/data/cli/compare/virt-install-kvm-rhel5.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-rhel6.xml b/tests/data/cli/compare/virt-install-kvm-rhel6.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-rhel6.xml rename to tests/data/cli/compare/virt-install-kvm-rhel6.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-rhel7.xml b/tests/data/cli/compare/virt-install-kvm-rhel7.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-rhel7.xml rename to tests/data/cli/compare/virt-install-kvm-rhel7.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-session-defaults.xml b/tests/data/cli/compare/virt-install-kvm-session-defaults.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-session-defaults.xml rename to tests/data/cli/compare/virt-install-kvm-session-defaults.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-win10.xml b/tests/data/cli/compare/virt-install-kvm-win10.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-win10.xml rename to tests/data/cli/compare/virt-install-kvm-win10.xml diff --git a/tests/data/clitest/compare/virt-install-kvm-win2k3-cdrom.xml b/tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-kvm-win2k3-cdrom.xml rename to tests/data/cli/compare/virt-install-kvm-win2k3-cdrom.xml diff --git a/tests/data/clitest/compare/virt-install-location-iso.xml b/tests/data/cli/compare/virt-install-location-iso.xml similarity index 98% rename from tests/data/clitest/compare/virt-install-location-iso.xml rename to tests/data/cli/compare/virt-install-location-iso.xml index d83e506d7..8a5a4bcf7 100644 --- a/tests/data/clitest/compare/virt-install-location-iso.xml +++ b/tests/data/cli/compare/virt-install-location-iso.xml @@ -39,7 +39,7 @@ - + diff --git a/tests/data/clitest/compare/virt-install-location-manual-kernel.xml b/tests/data/cli/compare/virt-install-location-manual-kernel.xml similarity index 98% rename from tests/data/clitest/compare/virt-install-location-manual-kernel.xml rename to tests/data/cli/compare/virt-install-location-manual-kernel.xml index 12d105103..fbb1b5d31 100644 --- a/tests/data/clitest/compare/virt-install-location-manual-kernel.xml +++ b/tests/data/cli/compare/virt-install-location-manual-kernel.xml @@ -29,7 +29,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/data/clitest/compare/virt-install-manual-init.xml b/tests/data/cli/compare/virt-install-manual-init.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-manual-init.xml rename to tests/data/cli/compare/virt-install-manual-init.xml diff --git a/tests/data/clitest/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-many-devices.xml rename to tests/data/cli/compare/virt-install-many-devices.xml diff --git a/tests/data/clitest/compare/virt-install-memory-hotplug.xml b/tests/data/cli/compare/virt-install-memory-hotplug.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-memory-hotplug.xml rename to tests/data/cli/compare/virt-install-memory-hotplug.xml diff --git a/tests/data/clitest/compare/virt-install-memory-option-backcompat.xml b/tests/data/cli/compare/virt-install-memory-option-backcompat.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-memory-option-backcompat.xml rename to tests/data/cli/compare/virt-install-memory-option-backcompat.xml diff --git a/tests/data/clitest/compare/virt-install-network-install-resources.xml b/tests/data/cli/compare/virt-install-network-install-resources.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-network-install-resources.xml rename to tests/data/cli/compare/virt-install-network-install-resources.xml diff --git a/tests/data/clitest/compare/virt-install-noargs-fail.xml b/tests/data/cli/compare/virt-install-noargs-fail.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-noargs-fail.xml rename to tests/data/cli/compare/virt-install-noargs-fail.xml diff --git a/tests/data/clitest/compare/virt-install-openbsd-defaults.xml b/tests/data/cli/compare/virt-install-openbsd-defaults.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-openbsd-defaults.xml rename to tests/data/cli/compare/virt-install-openbsd-defaults.xml diff --git a/tests/data/clitest/compare/virt-install-osinfo-multiple-short-id.xml b/tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-osinfo-multiple-short-id.xml rename to tests/data/cli/compare/virt-install-osinfo-multiple-short-id.xml diff --git a/tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml similarity index 98% rename from tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml rename to tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml index db4f09a6d..8a1fb0755 100644 --- a/tests/data/clitest/compare/virt-install-osinfo-netinst-unattended.xml +++ b/tests/data/cli/compare/virt-install-osinfo-netinst-unattended.xml @@ -34,7 +34,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/data/clitest/compare/virt-install-osinfo-url-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-url-unattended.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-osinfo-url-unattended.xml rename to tests/data/cli/compare/virt-install-osinfo-url-unattended.xml diff --git a/tests/data/clitest/compare/virt-install-osinfo-url-with-disk.xml b/tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-osinfo-url-with-disk.xml rename to tests/data/cli/compare/virt-install-osinfo-url-with-disk.xml diff --git a/tests/data/clitest/compare/virt-install-osinfo-url.xml b/tests/data/cli/compare/virt-install-osinfo-url.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-osinfo-url.xml rename to tests/data/cli/compare/virt-install-osinfo-url.xml diff --git a/tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml b/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml similarity index 97% rename from tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml rename to tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml index fcf83bded..ab8e13fce 100644 --- a/tests/data/clitest/compare/virt-install-osinfo-win7-unattended.xml +++ b/tests/data/cli/compare/virt-install-osinfo-win7-unattended.xml @@ -38,7 +38,7 @@ /usr/bin/qemu-kvm - + @@ -113,7 +113,7 @@ /usr/bin/qemu-kvm - + diff --git a/tests/data/clitest/compare/virt-install-osvariant-defaults-pxe.xml b/tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-osvariant-defaults-pxe.xml rename to tests/data/cli/compare/virt-install-osvariant-defaults-pxe.xml diff --git a/tests/data/clitest/compare/virt-install-osvariant-noargs-fail.xml b/tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-osvariant-noargs-fail.xml rename to tests/data/cli/compare/virt-install-osvariant-noargs-fail.xml diff --git a/tests/data/clitest/compare/virt-install-ppc64-graphics.xml b/tests/data/cli/compare/virt-install-ppc64-graphics.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-ppc64-graphics.xml rename to tests/data/cli/compare/virt-install-ppc64-graphics.xml diff --git a/tests/data/clitest/compare/virt-install-ppc64-headless.xml b/tests/data/cli/compare/virt-install-ppc64-headless.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-ppc64-headless.xml rename to tests/data/cli/compare/virt-install-ppc64-headless.xml diff --git a/tests/data/clitest/compare/virt-install-ppc64-machdefault-f20.xml b/tests/data/cli/compare/virt-install-ppc64-machdefault-f20.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-ppc64-machdefault-f20.xml rename to tests/data/cli/compare/virt-install-ppc64-machdefault-f20.xml diff --git a/tests/data/clitest/compare/virt-install-ppc64-pseries-f20.xml b/tests/data/cli/compare/virt-install-ppc64-pseries-f20.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-ppc64-pseries-f20.xml rename to tests/data/cli/compare/virt-install-ppc64-pseries-f20.xml diff --git a/tests/data/clitest/compare/virt-install-ppc64le-kvm-import.xml b/tests/data/cli/compare/virt-install-ppc64le-kvm-import.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-ppc64le-kvm-import.xml rename to tests/data/cli/compare/virt-install-ppc64le-kvm-import.xml diff --git a/tests/data/clitest/compare/virt-install-q35-defaults.xml b/tests/data/cli/compare/virt-install-q35-defaults.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-q35-defaults.xml rename to tests/data/cli/compare/virt-install-q35-defaults.xml diff --git a/tests/data/clitest/compare/virt-install-qemu-32-on-64.xml b/tests/data/cli/compare/virt-install-qemu-32-on-64.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-qemu-32-on-64.xml rename to tests/data/cli/compare/virt-install-qemu-32-on-64.xml diff --git a/tests/data/clitest/compare/virt-install-qemu-plain.xml b/tests/data/cli/compare/virt-install-qemu-plain.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-qemu-plain.xml rename to tests/data/cli/compare/virt-install-qemu-plain.xml diff --git a/tests/data/clitest/compare/virt-install-quiet-url.xml b/tests/data/cli/compare/virt-install-quiet-url.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-quiet-url.xml rename to tests/data/cli/compare/virt-install-quiet-url.xml diff --git a/tests/data/clitest/compare/virt-install-riscv64-graphics.xml b/tests/data/cli/compare/virt-install-riscv64-graphics.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-riscv64-graphics.xml rename to tests/data/cli/compare/virt-install-riscv64-graphics.xml diff --git a/tests/data/clitest/compare/virt-install-riscv64-headless.xml b/tests/data/cli/compare/virt-install-riscv64-headless.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-riscv64-headless.xml rename to tests/data/cli/compare/virt-install-riscv64-headless.xml diff --git a/tests/data/clitest/compare/virt-install-s390x-cdrom-KVMIBM.xml b/tests/data/cli/compare/virt-install-s390x-cdrom-KVMIBM.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-s390x-cdrom-KVMIBM.xml rename to tests/data/cli/compare/virt-install-s390x-cdrom-KVMIBM.xml diff --git a/tests/data/clitest/compare/virt-install-s390x-cdrom.xml b/tests/data/cli/compare/virt-install-s390x-cdrom.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-s390x-cdrom.xml rename to tests/data/cli/compare/virt-install-s390x-cdrom.xml diff --git a/tests/data/clitest/compare/virt-install-s390x-graphics.xml b/tests/data/cli/compare/virt-install-s390x-graphics.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-s390x-graphics.xml rename to tests/data/cli/compare/virt-install-s390x-graphics.xml diff --git a/tests/data/clitest/compare/virt-install-s390x-headless.xml b/tests/data/cli/compare/virt-install-s390x-headless.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-s390x-headless.xml rename to tests/data/cli/compare/virt-install-s390x-headless.xml diff --git a/tests/data/clitest/compare/virt-install-simple-pxe.xml b/tests/data/cli/compare/virt-install-simple-pxe.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-simple-pxe.xml rename to tests/data/cli/compare/virt-install-simple-pxe.xml diff --git a/tests/data/clitest/compare/virt-install-singleton-config-1.xml b/tests/data/cli/compare/virt-install-singleton-config-1.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-singleton-config-1.xml rename to tests/data/cli/compare/virt-install-singleton-config-1.xml diff --git a/tests/data/clitest/compare/virt-install-singleton-config-2.xml b/tests/data/cli/compare/virt-install-singleton-config-2.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-singleton-config-2.xml rename to tests/data/cli/compare/virt-install-singleton-config-2.xml diff --git a/tests/data/clitest/compare/virt-install-singleton-config-3.xml b/tests/data/cli/compare/virt-install-singleton-config-3.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-singleton-config-3.xml rename to tests/data/cli/compare/virt-install-singleton-config-3.xml diff --git a/tests/data/clitest/compare/virt-install-test-url-detection.xml b/tests/data/cli/compare/virt-install-test-url-detection.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-test-url-detection.xml rename to tests/data/cli/compare/virt-install-test-url-detection.xml diff --git a/tests/data/clitest/compare/virt-install-vz-ct-template.xml b/tests/data/cli/compare/virt-install-vz-ct-template.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-vz-ct-template.xml rename to tests/data/cli/compare/virt-install-vz-ct-template.xml diff --git a/tests/data/clitest/compare/virt-install-w2k3-cdrom.xml b/tests/data/cli/compare/virt-install-w2k3-cdrom.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-w2k3-cdrom.xml rename to tests/data/cli/compare/virt-install-w2k3-cdrom.xml diff --git a/tests/data/clitest/compare/virt-install-win7-uefi.xml b/tests/data/cli/compare/virt-install-win7-uefi.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-win7-uefi.xml rename to tests/data/cli/compare/virt-install-win7-uefi.xml diff --git a/tests/data/clitest/compare/virt-install-x86_64-graphics.xml b/tests/data/cli/compare/virt-install-x86_64-graphics.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-x86_64-graphics.xml rename to tests/data/cli/compare/virt-install-x86_64-graphics.xml diff --git a/tests/data/clitest/compare/virt-install-x86_64-headless.xml b/tests/data/cli/compare/virt-install-x86_64-headless.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-x86_64-headless.xml rename to tests/data/cli/compare/virt-install-x86_64-headless.xml diff --git a/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev-full.xml b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-x86_64-launch-security-sev-full.xml rename to tests/data/cli/compare/virt-install-x86_64-launch-security-sev-full.xml diff --git a/tests/data/clitest/compare/virt-install-x86_64-launch-security-sev.xml b/tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-x86_64-launch-security-sev.xml rename to tests/data/cli/compare/virt-install-x86_64-launch-security-sev.xml diff --git a/tests/data/clitest/compare/virt-install-xen-default.xml b/tests/data/cli/compare/virt-install-xen-default.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-xen-default.xml rename to tests/data/cli/compare/virt-install-xen-default.xml diff --git a/tests/data/clitest/compare/virt-install-xen-hvm.xml b/tests/data/cli/compare/virt-install-xen-hvm.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-xen-hvm.xml rename to tests/data/cli/compare/virt-install-xen-hvm.xml diff --git a/tests/data/clitest/compare/virt-install-xen-pv.xml b/tests/data/cli/compare/virt-install-xen-pv.xml similarity index 100% rename from tests/data/clitest/compare/virt-install-xen-pv.xml rename to tests/data/cli/compare/virt-install-xen-pv.xml diff --git a/tests/data/clitest/compare/virt-xml-add-disk-basic-start.xml b/tests/data/cli/compare/virt-xml-add-disk-basic-start.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-disk-basic-start.xml rename to tests/data/cli/compare/virt-xml-add-disk-basic-start.xml diff --git a/tests/data/clitest/compare/virt-xml-add-disk-basic.xml b/tests/data/cli/compare/virt-xml-add-disk-basic.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-disk-basic.xml rename to tests/data/cli/compare/virt-xml-add-disk-basic.xml diff --git a/tests/data/clitest/compare/virt-xml-add-disk-create-storage-start.xml b/tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-disk-create-storage-start.xml rename to tests/data/cli/compare/virt-xml-add-disk-create-storage-start.xml diff --git a/tests/data/clitest/compare/virt-xml-add-disk-create-storage.xml b/tests/data/cli/compare/virt-xml-add-disk-create-storage.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-disk-create-storage.xml rename to tests/data/cli/compare/virt-xml-add-disk-create-storage.xml diff --git a/tests/data/clitest/compare/virt-xml-add-disk-default-storage.xml b/tests/data/cli/compare/virt-xml-add-disk-default-storage.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-disk-default-storage.xml rename to tests/data/cli/compare/virt-xml-add-disk-default-storage.xml diff --git a/tests/data/clitest/compare/virt-xml-add-disk-notarget.xml b/tests/data/cli/compare/virt-xml-add-disk-notarget.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-disk-notarget.xml rename to tests/data/cli/compare/virt-xml-add-disk-notarget.xml diff --git a/tests/data/clitest/compare/virt-xml-add-host-device-start.xml b/tests/data/cli/compare/virt-xml-add-host-device-start.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-host-device-start.xml rename to tests/data/cli/compare/virt-xml-add-host-device-start.xml diff --git a/tests/data/clitest/compare/virt-xml-add-host-device.xml b/tests/data/cli/compare/virt-xml-add-host-device.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-host-device.xml rename to tests/data/cli/compare/virt-xml-add-host-device.xml diff --git a/tests/data/clitest/compare/virt-xml-add-sound.xml b/tests/data/cli/compare/virt-xml-add-sound.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-add-sound.xml rename to tests/data/cli/compare/virt-xml-add-sound.xml diff --git a/tests/data/clitest/compare/virt-xml-build-blkiotune.xml b/tests/data/cli/compare/virt-xml-build-blkiotune.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-build-blkiotune.xml rename to tests/data/cli/compare/virt-xml-build-blkiotune.xml diff --git a/tests/data/clitest/compare/virt-xml-build-cpu.xml b/tests/data/cli/compare/virt-xml-build-cpu.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-build-cpu.xml rename to tests/data/cli/compare/virt-xml-build-cpu.xml diff --git a/tests/data/clitest/compare/virt-xml-build-disk-domain.xml b/tests/data/cli/compare/virt-xml-build-disk-domain.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-build-disk-domain.xml rename to tests/data/cli/compare/virt-xml-build-disk-domain.xml diff --git a/tests/data/clitest/compare/virt-xml-build-disk-plain.xml b/tests/data/cli/compare/virt-xml-build-disk-plain.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-build-disk-plain.xml rename to tests/data/cli/compare/virt-xml-build-disk-plain.xml diff --git a/tests/data/clitest/compare/virt-xml-build-idmap.xml b/tests/data/cli/compare/virt-xml-build-idmap.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-build-idmap.xml rename to tests/data/cli/compare/virt-xml-build-idmap.xml diff --git a/tests/data/clitest/compare/virt-xml-build-tpm.xml b/tests/data/cli/compare/virt-xml-build-tpm.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-build-tpm.xml rename to tests/data/cli/compare/virt-xml-build-tpm.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-all.xml b/tests/data/cli/compare/virt-xml-edit-all.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-all.xml rename to tests/data/cli/compare/virt-xml-edit-all.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-bootorder.xml b/tests/data/cli/compare/virt-xml-edit-bootorder.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-bootorder.xml rename to tests/data/cli/compare/virt-xml-edit-bootorder.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-clear-clock.xml b/tests/data/cli/compare/virt-xml-edit-clear-clock.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-clear-clock.xml rename to tests/data/cli/compare/virt-xml-edit-clear-clock.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-clear-cpu.xml b/tests/data/cli/compare/virt-xml-edit-clear-cpu.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-clear-cpu.xml rename to tests/data/cli/compare/virt-xml-edit-clear-cpu.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-clear-disk.xml b/tests/data/cli/compare/virt-xml-edit-clear-disk.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-clear-disk.xml rename to tests/data/cli/compare/virt-xml-edit-clear-disk.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-clearxml-qemu-commandline.xml b/tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-clearxml-qemu-commandline.xml rename to tests/data/cli/compare/virt-xml-edit-clearxml-qemu-commandline.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-disable-memballoon.xml b/tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-disable-memballoon.xml rename to tests/data/cli/compare/virt-xml-edit-disable-memballoon.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-disk-unset.xml b/tests/data/cli/compare/virt-xml-edit-disk-unset.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-disk-unset.xml rename to tests/data/cli/compare/virt-xml-edit-disk-unset.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-graphics-listen-none.xml b/tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-graphics-listen-none.xml rename to tests/data/cli/compare/virt-xml-edit-graphics-listen-none.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-graphics-spice-gl.xml b/tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-graphics-spice-gl.xml rename to tests/data/cli/compare/virt-xml-edit-graphics-spice-gl.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-metadata-full-os.xml b/tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-metadata-full-os.xml rename to tests/data/cli/compare/virt-xml-edit-metadata-full-os.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-neg-num.xml b/tests/data/cli/compare/virt-xml-edit-neg-num.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-neg-num.xml rename to tests/data/cli/compare/virt-xml-edit-neg-num.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-pos-num.xml b/tests/data/cli/compare/virt-xml-edit-pos-num.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-pos-num.xml rename to tests/data/cli/compare/virt-xml-edit-pos-num.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder.xml rename to tests/data/cli/compare/virt-xml-edit-select-disk-bootorder.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder2.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-select-disk-bootorder2.xml rename to tests/data/cli/compare/virt-xml-edit-select-disk-bootorder2.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-path.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-path.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-select-disk-path.xml rename to tests/data/cli/compare/virt-xml-edit-select-disk-path.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-select-disk-target.xml b/tests/data/cli/compare/virt-xml-edit-select-disk-target.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-select-disk-target.xml rename to tests/data/cli/compare/virt-xml-edit-select-disk-target.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-select-network-mac.xml b/tests/data/cli/compare/virt-xml-edit-select-network-mac.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-select-network-mac.xml rename to tests/data/cli/compare/virt-xml-edit-select-network-mac.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-select-sound-model.xml b/tests/data/cli/compare/virt-xml-edit-select-sound-model.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-select-sound-model.xml rename to tests/data/cli/compare/virt-xml-edit-select-sound-model.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-blkiotune.xml b/tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-blkiotune.xml rename to tests/data/cli/compare/virt-xml-edit-simple-blkiotune.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-boot.xml b/tests/data/cli/compare/virt-xml-edit-simple-boot.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-boot.xml rename to tests/data/cli/compare/virt-xml-edit-simple-boot.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-channel.xml b/tests/data/cli/compare/virt-xml-edit-simple-channel.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-channel.xml rename to tests/data/cli/compare/virt-xml-edit-simple-channel.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-clock.xml b/tests/data/cli/compare/virt-xml-edit-simple-clock.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-clock.xml rename to tests/data/cli/compare/virt-xml-edit-simple-clock.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-console.xml b/tests/data/cli/compare/virt-xml-edit-simple-console.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-console.xml rename to tests/data/cli/compare/virt-xml-edit-simple-console.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-controller.xml b/tests/data/cli/compare/virt-xml-edit-simple-controller.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-controller.xml rename to tests/data/cli/compare/virt-xml-edit-simple-controller.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-cpu.xml b/tests/data/cli/compare/virt-xml-edit-simple-cpu.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-cpu.xml rename to tests/data/cli/compare/virt-xml-edit-simple-cpu.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-disk-remove-path.xml b/tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-disk-remove-path.xml rename to tests/data/cli/compare/virt-xml-edit-simple-disk-remove-path.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-disk.xml b/tests/data/cli/compare/virt-xml-edit-simple-disk.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-disk.xml rename to tests/data/cli/compare/virt-xml-edit-simple-disk.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-events.xml b/tests/data/cli/compare/virt-xml-edit-simple-events.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-events.xml rename to tests/data/cli/compare/virt-xml-edit-simple-events.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-features.xml b/tests/data/cli/compare/virt-xml-edit-simple-features.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-features.xml rename to tests/data/cli/compare/virt-xml-edit-simple-features.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-filesystem.xml b/tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-filesystem.xml rename to tests/data/cli/compare/virt-xml-edit-simple-filesystem.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-graphics.xml b/tests/data/cli/compare/virt-xml-edit-simple-graphics.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-graphics.xml rename to tests/data/cli/compare/virt-xml-edit-simple-graphics.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-host-device.xml b/tests/data/cli/compare/virt-xml-edit-simple-host-device.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-host-device.xml rename to tests/data/cli/compare/virt-xml-edit-simple-host-device.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-idmap.xml b/tests/data/cli/compare/virt-xml-edit-simple-idmap.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-idmap.xml rename to tests/data/cli/compare/virt-xml-edit-simple-idmap.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-memballoon.xml b/tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-memballoon.xml rename to tests/data/cli/compare/virt-xml-edit-simple-memballoon.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-memory.xml b/tests/data/cli/compare/virt-xml-edit-simple-memory.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-memory.xml rename to tests/data/cli/compare/virt-xml-edit-simple-memory.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-metadata.xml b/tests/data/cli/compare/virt-xml-edit-simple-metadata.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-metadata.xml rename to tests/data/cli/compare/virt-xml-edit-simple-metadata.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-network.xml b/tests/data/cli/compare/virt-xml-edit-simple-network.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-network.xml rename to tests/data/cli/compare/virt-xml-edit-simple-network.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-numatune.xml b/tests/data/cli/compare/virt-xml-edit-simple-numatune.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-numatune.xml rename to tests/data/cli/compare/virt-xml-edit-simple-numatune.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-parallel.xml b/tests/data/cli/compare/virt-xml-edit-simple-parallel.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-parallel.xml rename to tests/data/cli/compare/virt-xml-edit-simple-parallel.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-pm.xml b/tests/data/cli/compare/virt-xml-edit-simple-pm.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-pm.xml rename to tests/data/cli/compare/virt-xml-edit-simple-pm.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-qemu-commandline.xml b/tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-qemu-commandline.xml rename to tests/data/cli/compare/virt-xml-edit-simple-qemu-commandline.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-redirdev.xml b/tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-redirdev.xml rename to tests/data/cli/compare/virt-xml-edit-simple-redirdev.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-rng.xml b/tests/data/cli/compare/virt-xml-edit-simple-rng.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-rng.xml rename to tests/data/cli/compare/virt-xml-edit-simple-rng.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-security.xml b/tests/data/cli/compare/virt-xml-edit-simple-security.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-security.xml rename to tests/data/cli/compare/virt-xml-edit-simple-security.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-serial.xml b/tests/data/cli/compare/virt-xml-edit-simple-serial.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-serial.xml rename to tests/data/cli/compare/virt-xml-edit-simple-serial.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-smartcard.xml b/tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-smartcard.xml rename to tests/data/cli/compare/virt-xml-edit-simple-smartcard.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-soundhw.xml b/tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-soundhw.xml rename to tests/data/cli/compare/virt-xml-edit-simple-soundhw.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-tpm.xml b/tests/data/cli/compare/virt-xml-edit-simple-tpm.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-tpm.xml rename to tests/data/cli/compare/virt-xml-edit-simple-tpm.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-vcpus.xml b/tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-vcpus.xml rename to tests/data/cli/compare/virt-xml-edit-simple-vcpus.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-video.xml b/tests/data/cli/compare/virt-xml-edit-simple-video.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-video.xml rename to tests/data/cli/compare/virt-xml-edit-simple-video.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-vsock.xml b/tests/data/cli/compare/virt-xml-edit-simple-vsock.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-vsock.xml rename to tests/data/cli/compare/virt-xml-edit-simple-vsock.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-simple-watchdog.xml b/tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-simple-watchdog.xml rename to tests/data/cli/compare/virt-xml-edit-simple-watchdog.xml diff --git a/tests/data/clitest/compare/virt-xml-edit-video-virtio.xml b/tests/data/cli/compare/virt-xml-edit-video-virtio.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-edit-video-virtio.xml rename to tests/data/cli/compare/virt-xml-edit-video-virtio.xml diff --git a/tests/data/clitest/compare/virt-xml-hyperv-uefi-collision.xml b/tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-hyperv-uefi-collision.xml rename to tests/data/cli/compare/virt-xml-hyperv-uefi-collision.xml diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml rename to tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-cmdline.xml diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-xml.xml b/tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-kvm-add-disk-os-from-xml.xml rename to tests/data/cli/compare/virt-xml-kvm-add-disk-os-from-xml.xml diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-cmdline.xml b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-cmdline.xml rename to tests/data/cli/compare/virt-xml-kvm-add-network-os-from-cmdline.xml diff --git a/tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-xml.xml b/tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-kvm-add-network-os-from-xml.xml rename to tests/data/cli/compare/virt-xml-kvm-add-network-os-from-xml.xml diff --git a/tests/data/clitest/compare/virt-xml-print-xml.xml b/tests/data/cli/compare/virt-xml-print-xml.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-print-xml.xml rename to tests/data/cli/compare/virt-xml-print-xml.xml diff --git a/tests/data/clitest/compare/virt-xml-prompt-response.xml b/tests/data/cli/compare/virt-xml-prompt-response.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-prompt-response.xml rename to tests/data/cli/compare/virt-xml-prompt-response.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-disk-index.xml b/tests/data/cli/compare/virt-xml-remove-disk-index.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-disk-index.xml rename to tests/data/cli/compare/virt-xml-remove-disk-index.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-disk-path-start.xml b/tests/data/cli/compare/virt-xml-remove-disk-path-start.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-disk-path-start.xml rename to tests/data/cli/compare/virt-xml-remove-disk-path-start.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-disk-path.xml b/tests/data/cli/compare/virt-xml-remove-disk-path.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-disk-path.xml rename to tests/data/cli/compare/virt-xml-remove-disk-path.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-hostdev-name.xml b/tests/data/cli/compare/virt-xml-remove-hostdev-name.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-hostdev-name.xml rename to tests/data/cli/compare/virt-xml-remove-hostdev-name.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-memballoon.xml b/tests/data/cli/compare/virt-xml-remove-memballoon.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-memballoon.xml rename to tests/data/cli/compare/virt-xml-remove-memballoon.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-sound-model.xml b/tests/data/cli/compare/virt-xml-remove-sound-model.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-sound-model.xml rename to tests/data/cli/compare/virt-xml-remove-sound-model.xml diff --git a/tests/data/clitest/compare/virt-xml-remove-video-all.xml b/tests/data/cli/compare/virt-xml-remove-video-all.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-remove-video-all.xml rename to tests/data/cli/compare/virt-xml-remove-video-all.xml diff --git a/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder.xml b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-start-select-disk-bootorder.xml rename to tests/data/cli/compare/virt-xml-start-select-disk-bootorder.xml diff --git a/tests/data/clitest/compare/virt-xml-start-select-disk-bootorder2.xml b/tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-start-select-disk-bootorder2.xml rename to tests/data/cli/compare/virt-xml-start-select-disk-bootorder2.xml diff --git a/tests/data/clitest/compare/virt-xml-stdin-edit.xml b/tests/data/cli/compare/virt-xml-stdin-edit.xml similarity index 100% rename from tests/data/clitest/compare/virt-xml-stdin-edit.xml rename to tests/data/cli/compare/virt-xml-stdin-edit.xml diff --git a/tests/data/clitest/fake-centos65-label.iso b/tests/data/cli/fake-centos65-label.iso similarity index 100% rename from tests/data/clitest/fake-centos65-label.iso rename to tests/data/cli/fake-centos65-label.iso diff --git a/tests/data/clitest/fake-f26-netinst.iso b/tests/data/cli/fake-f26-netinst.iso similarity index 100% rename from tests/data/clitest/fake-f26-netinst.iso rename to tests/data/cli/fake-f26-netinst.iso diff --git a/tests/data/clitest/fake-f29-live.iso b/tests/data/cli/fake-f29-live.iso similarity index 100% rename from tests/data/clitest/fake-f29-live.iso rename to tests/data/cli/fake-f29-live.iso diff --git a/tests/data/clitest/fake-fedora17-tree.iso b/tests/data/cli/fake-fedora17-tree.iso similarity index 100% rename from tests/data/clitest/fake-fedora17-tree.iso rename to tests/data/cli/fake-fedora17-tree.iso diff --git a/tests/data/clitest/fake-no-osinfo.iso b/tests/data/cli/fake-no-osinfo.iso similarity index 100% rename from tests/data/clitest/fake-no-osinfo.iso rename to tests/data/cli/fake-no-osinfo.iso diff --git a/tests/data/clitest/fake-win7.iso b/tests/data/cli/fake-win7.iso similarity index 100% rename from tests/data/clitest/fake-win7.iso rename to tests/data/cli/fake-win7.iso diff --git a/tests/data/clitest/fakefedoratree/.treeinfo b/tests/data/cli/fakefedoratree/.treeinfo similarity index 100% rename from tests/data/clitest/fakefedoratree/.treeinfo rename to tests/data/cli/fakefedoratree/.treeinfo diff --git a/tests/data/clitest/fakefedoratree/images/boot.iso b/tests/data/cli/fakefedoratree/images/boot.iso similarity index 100% rename from tests/data/clitest/fakefedoratree/images/boot.iso rename to tests/data/cli/fakefedoratree/images/boot.iso diff --git a/tests/data/clitest/fakefedoratree/images/pxeboot/initrd.img b/tests/data/cli/fakefedoratree/images/pxeboot/initrd.img similarity index 100% rename from tests/data/clitest/fakefedoratree/images/pxeboot/initrd.img rename to tests/data/cli/fakefedoratree/images/pxeboot/initrd.img diff --git a/tests/data/clitest/fakefedoratree/images/pxeboot/vmlinuz b/tests/data/cli/fakefedoratree/images/pxeboot/vmlinuz similarity index 100% rename from tests/data/clitest/fakefedoratree/images/pxeboot/vmlinuz rename to tests/data/cli/fakefedoratree/images/pxeboot/vmlinuz diff --git a/tests/data/clitest/fakefedoratree/images/xen/initrd.img b/tests/data/cli/fakefedoratree/images/xen/initrd.img similarity index 100% rename from tests/data/clitest/fakefedoratree/images/xen/initrd.img rename to tests/data/cli/fakefedoratree/images/xen/initrd.img diff --git a/tests/data/clitest/fakefedoratree/images/xen/vmlinuz b/tests/data/cli/fakefedoratree/images/xen/vmlinuz similarity index 100% rename from tests/data/clitest/fakefedoratree/images/xen/vmlinuz rename to tests/data/cli/fakefedoratree/images/xen/vmlinuz diff --git a/tests/data/clitest/fakerhel6tree/.treeinfo b/tests/data/cli/fakerhel6tree/.treeinfo similarity index 100% rename from tests/data/clitest/fakerhel6tree/.treeinfo rename to tests/data/cli/fakerhel6tree/.treeinfo diff --git a/tests/data/clitest/fakerhel6tree/images/boot.iso b/tests/data/cli/fakerhel6tree/images/boot.iso similarity index 100% rename from tests/data/clitest/fakerhel6tree/images/boot.iso rename to tests/data/cli/fakerhel6tree/images/boot.iso diff --git a/tests/data/clitest/fakerhel6tree/images/pxeboot/initrd.img b/tests/data/cli/fakerhel6tree/images/pxeboot/initrd.img similarity index 100% rename from tests/data/clitest/fakerhel6tree/images/pxeboot/initrd.img rename to tests/data/cli/fakerhel6tree/images/pxeboot/initrd.img diff --git a/tests/data/clitest/fakerhel6tree/images/pxeboot/vmlinuz b/tests/data/cli/fakerhel6tree/images/pxeboot/vmlinuz similarity index 100% rename from tests/data/clitest/fakerhel6tree/images/pxeboot/vmlinuz rename to tests/data/cli/fakerhel6tree/images/pxeboot/vmlinuz diff --git a/tests/data/clitest/fakerhel6tree/images/xen/initrd.img b/tests/data/cli/fakerhel6tree/images/xen/initrd.img similarity index 100% rename from tests/data/clitest/fakerhel6tree/images/xen/initrd.img rename to tests/data/cli/fakerhel6tree/images/xen/initrd.img diff --git a/tests/data/clitest/fakerhel6tree/images/xen/vmlinuz b/tests/data/cli/fakerhel6tree/images/xen/vmlinuz similarity index 100% rename from tests/data/clitest/fakerhel6tree/images/xen/vmlinuz rename to tests/data/cli/fakerhel6tree/images/xen/vmlinuz diff --git a/tests/data/clitest/testdriver-defaultpool-collision.xml b/tests/data/cli/testdriver-defaultpool-collision.xml similarity index 100% rename from tests/data/clitest/testdriver-defaultpool-collision.xml rename to tests/data/cli/testdriver-defaultpool-collision.xml diff --git a/tests/data/clitest/user-password.txt b/tests/data/cli/user-password.txt similarity index 100% rename from tests/data/clitest/user-password.txt rename to tests/data/cli/user-password.txt diff --git a/tests/data/clitest/virtxml-qemu-commandline-clear.xml b/tests/data/cli/virtxml-qemu-commandline-clear.xml similarity index 100% rename from tests/data/clitest/virtxml-qemu-commandline-clear.xml rename to tests/data/cli/virtxml-qemu-commandline-clear.xml diff --git a/tests/data/clitest/virtxml-stdin-edit.xml b/tests/data/cli/virtxml-stdin-edit.xml similarity index 100% rename from tests/data/clitest/virtxml-stdin-edit.xml rename to tests/data/cli/virtxml-stdin-edit.xml diff --git a/tests/capabilities.py b/tests/test_capabilities.py similarity index 100% rename from tests/capabilities.py rename to tests/test_capabilities.py diff --git a/tests/checkprops.py b/tests/test_checkprops.py similarity index 97% rename from tests/checkprops.py rename to tests/test_checkprops.py index f2a5d499a..1ccb254b2 100644 --- a/tests/checkprops.py +++ b/tests/test_checkprops.py @@ -55,7 +55,7 @@ class CheckPropsTest(unittest.TestCase): "untested in the test suite. This could be caused\n" "by a previous test suite failure, or if you added\n" "a new property and didn't extend the test suite.\n" - "Look into extending clitest.py and/or xmlparse.py.") + "Look into extending test_cli.py and/or test_xmlparse.py.") if msg: self.fail(msg) diff --git a/tests/clitest.py b/tests/test_cli.py similarity index 99% rename from tests/clitest.py rename to tests/test_cli.py index 6be567500..89e8574b2 100644 --- a/tests/clitest.py +++ b/tests/test_cli.py @@ -30,7 +30,7 @@ os.environ["HOME"] = "/tmp" os.environ["DISPLAY"] = ":3.4" TMP_IMAGE_DIR = "/tmp/__virtinst_cli_" -XMLDIR = "tests/data/clitest" +XMLDIR = "tests/data/cli" OLD_OSINFO = utils.has_old_osinfo() NO_OSINFO_UNATTEND = not unattended.OSInstallScript.have_new_libosinfo() HAS_ISOINFO = shutil.which("isoinfo") @@ -453,7 +453,7 @@ class App(object): # add_valid: A test that should pass # add_invalid: A test that should fail # add_compare: Get the generated XML, and compare against the passed filename -# in tests/data/clitest/compare/ +# in tests/data/cli/compare/ # ###################### diff --git a/tests/clonetest.py b/tests/test_cloner.py similarity index 100% rename from tests/clonetest.py rename to tests/test_cloner.py diff --git a/tests/dist.py b/tests/test_dist.py similarity index 100% rename from tests/dist.py rename to tests/test_dist.py diff --git a/tests/nodedev.py b/tests/test_nodedev.py similarity index 100% rename from tests/nodedev.py rename to tests/test_nodedev.py diff --git a/tests/osdict.py b/tests/test_osdict.py similarity index 100% rename from tests/osdict.py rename to tests/test_osdict.py diff --git a/tests/storage.py b/tests/test_storage.py similarity index 100% rename from tests/storage.py rename to tests/test_storage.py diff --git a/tests/uriparse.py b/tests/test_uriparse.py similarity index 100% rename from tests/uriparse.py rename to tests/test_uriparse.py diff --git a/tests/xmlconfig.py b/tests/test_xmlconfig.py similarity index 98% rename from tests/xmlconfig.py rename to tests/test_xmlconfig.py index b92a7d868..dccc6a176 100644 --- a/tests/xmlconfig.py +++ b/tests/test_xmlconfig.py @@ -61,7 +61,7 @@ class TestXMLMisc(unittest.TestCase): """ Misc tests for various XML special behavior. These should only aim for testing any particularly tricky bits, general XML generation should - be through virt-install examples in clitest + be through virt-install examples in test_cli """ @property def conn(self): @@ -122,13 +122,13 @@ class TestXMLMisc(unittest.TestCase): # Simple sanity test to make sure detect_distro works. test-urls # does much more exhaustive testing but it's only run occasionally i = _make_installer( - location="tests/data/clitest/fakefedoratree") + location="tests/data/cli/fakefedoratree") g = _make_guest() v = i.detect_distro(g) self.assertEqual(v, "fedora17") i = _make_installer( - location="tests/data/clitest/fakerhel6tree") + location="tests/data/cli/fakerhel6tree") g = _make_guest() v = i.detect_distro(g) self.assertEqual(v, "rhel6.0") diff --git a/tests/xmlparse.py b/tests/test_xmlparse.py similarity index 100% rename from tests/xmlparse.py rename to tests/test_xmlparse.py diff --git a/tests/uitests/about.py b/tests/uitests/test_about.py similarity index 100% rename from tests/uitests/about.py rename to tests/uitests/test_about.py diff --git a/tests/uitests/addhardware.py b/tests/uitests/test_addhardware.py similarity index 100% rename from tests/uitests/addhardware.py rename to tests/uitests/test_addhardware.py diff --git a/tests/uitests/cli.py b/tests/uitests/test_cli.py similarity index 100% rename from tests/uitests/cli.py rename to tests/uitests/test_cli.py diff --git a/tests/uitests/clonevm.py b/tests/uitests/test_clonevm.py similarity index 100% rename from tests/uitests/clonevm.py rename to tests/uitests/test_clonevm.py diff --git a/tests/uitests/connect.py b/tests/uitests/test_connect.py similarity index 100% rename from tests/uitests/connect.py rename to tests/uitests/test_connect.py diff --git a/tests/uitests/createnet.py b/tests/uitests/test_createnet.py similarity index 100% rename from tests/uitests/createnet.py rename to tests/uitests/test_createnet.py diff --git a/tests/uitests/createpool.py b/tests/uitests/test_createpool.py similarity index 100% rename from tests/uitests/createpool.py rename to tests/uitests/test_createpool.py diff --git a/tests/uitests/createvol.py b/tests/uitests/test_createvol.py similarity index 100% rename from tests/uitests/createvol.py rename to tests/uitests/test_createvol.py diff --git a/tests/uitests/details.py b/tests/uitests/test_details.py similarity index 100% rename from tests/uitests/details.py rename to tests/uitests/test_details.py diff --git a/tests/uitests/host.py b/tests/uitests/test_host.py similarity index 100% rename from tests/uitests/host.py rename to tests/uitests/test_host.py diff --git a/tests/uitests/livetests.py b/tests/uitests/test_livetests.py similarity index 100% rename from tests/uitests/livetests.py rename to tests/uitests/test_livetests.py diff --git a/tests/uitests/manager.py b/tests/uitests/test_manager.py similarity index 100% rename from tests/uitests/manager.py rename to tests/uitests/test_manager.py diff --git a/tests/uitests/mediachange.py b/tests/uitests/test_mediachange.py similarity index 100% rename from tests/uitests/mediachange.py rename to tests/uitests/test_mediachange.py diff --git a/tests/uitests/migrate.py b/tests/uitests/test_migrate.py similarity index 100% rename from tests/uitests/migrate.py rename to tests/uitests/test_migrate.py diff --git a/tests/uitests/newvm.py b/tests/uitests/test_newvm.py similarity index 100% rename from tests/uitests/newvm.py rename to tests/uitests/test_newvm.py diff --git a/tests/uitests/prefs.py b/tests/uitests/test_prefs.py similarity index 100% rename from tests/uitests/prefs.py rename to tests/uitests/test_prefs.py diff --git a/tests/uitests/snapshot.py b/tests/uitests/test_snapshot.py similarity index 100% rename from tests/uitests/snapshot.py rename to tests/uitests/test_snapshot.py diff --git a/tests/utils.py b/tests/utils.py index b25c322a7..43fe15865 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -64,7 +64,7 @@ class _URIs(object): self.test_suite = _testtmpl % (os.getcwd() + "/tests/testsuite.xml") self.test_remote = self.test_full + ",remote" self.test_defaultpool_collision = (_testtmpl % (os.getcwd() + - "/tests/data/clitest/testdriver-defaultpool-collision.xml")) + "/tests/data/cli/testdriver-defaultpool-collision.xml")) self.xen = self.test_full + _caps("xen-rhel5.4.xml") + ",xen" self.lxc = self.test_full + _caps("lxc.xml") + ",lxc" diff --git a/virtinst/buildconfig.py b/virtinst/buildconfig.py index d19e7dda1..b3468481f 100644 --- a/virtinst/buildconfig.py +++ b/virtinst/buildconfig.py @@ -29,7 +29,7 @@ if os.path.exists(_cfgpath): _istest = "VIRTINST_TEST_SUITE" in os.environ _running_from_srcdir = os.path.exists( - os.path.join(_srcdir, "tests", "clitest.py")) + os.path.join(_srcdir, "tests", "test_cli.py")) def _split_list(commastr): diff --git a/virtinst/install/urlfetcher.py b/virtinst/install/urlfetcher.py index fe5c5d7e5..b3f54353f 100644 --- a/virtinst/install/urlfetcher.py +++ b/virtinst/install/urlfetcher.py @@ -30,7 +30,7 @@ def _make_mock_url(url, filesyntax): if url.endswith("treeinfo"): # If the url is requesting treeinfo, give a fake treeinfo from # our testsuite data - fn = ("%s/../../tests/data/clitest/fakerhel6tree/.treeinfo" % + fn = ("%s/../../tests/data/cli/fakerhel6tree/.treeinfo" % os.path.abspath(os.path.dirname(__file__))) abspath = os.path.abspath(fn) else: