Repository: cloudstack Updated Branches: refs/heads/4.9 2ebf94928 -> 9b9b49e10
CLOUDSTACK-9527: Skip tests not supported for hypervisor - test_01_test_vm_volume_snapshot not supported for Xen, tests keep failing - Skip snapshot tests for centos6/kvm as snapshot is not supported by older qemu-img versions Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/394f2e35 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/394f2e35 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/394f2e35 Branch: refs/heads/4.9 Commit: 394f2e359f2af9de6c7e586659fed47051f44146 Parents: dc93268 Author: Boris <[email protected]> Authored: Mon Oct 3 17:53:51 2016 +0300 Committer: Rohit Yadav <[email protected]> Committed: Wed Oct 5 15:11:00 2016 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_snapshots.py | 2 +- test/integration/smoke/test_vm_snapshots.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/394f2e35/test/integration/smoke/test_snapshots.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py index 4b1fcbd..7cd56c8 100644 --- a/test/integration/smoke/test_snapshots.py +++ b/test/integration/smoke/test_snapshots.py @@ -47,7 +47,7 @@ class TestSnapshotRootDisk(cloudstackTestCase): cls.hypervisorNotSupported = False cls.hypervisor = cls.testClient.getHypervisorInfo() - if cls.hypervisor.lower() in ['hyperv', 'lxc']: + if cls.hypervisor.lower() in ['hyperv', 'lxc'] or 'kvm-centos6' in cls.testClient.getZoneForTests(): cls.hypervisorNotSupported = True cls._cleanup = [] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/394f2e35/test/integration/smoke/test_vm_snapshots.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py index 3831848..d173aa4 100644 --- a/test/integration/smoke/test_vm_snapshots.py +++ b/test/integration/smoke/test_vm_snapshots.py @@ -16,7 +16,7 @@ # under the License. # Import Local Modules -from marvin.codes import FAILED, KVM, PASS +from marvin.codes import FAILED, KVM, PASS, XEN_SERVER from nose.plugins.attrib import attr from marvin.cloudstackTestCase import cloudstackTestCase from marvin.lib.utils import random_gen, cleanup_resources, validateList, is_snapshot_on_nfs @@ -291,7 +291,7 @@ class TestSnapshots(cloudstackTestCase): cls.services = cls.testClient.getParsedTestDataConfig() cls.unsupportedHypervisor = False cls.hypervisor = cls.testClient.getHypervisorInfo() - if cls.hypervisor.lower() in (KVM.lower(), "hyperv", "lxc"): + if cls.hypervisor.lower() in (KVM.lower(), "hyperv", "lxc", XEN_SERVER.lower()): cls.unsupportedHypervisor = True return # Get Domain, Zone, Template
