apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9527: Skip tests not supported for hypervisor

Browse Source 
- 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 <rohit.yadav@shapeblue.com>
This commit is contained in:
Boris 2016-10-03 17:53:51 +03:00 committed by Rohit Yadav
parent dc93268788
commit 394f2e359f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/smoke/test_snapshots.py
View File

@ -47,7 +47,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
cls.hypervisorNotSupported = False cls.hypervisorNotSupported = False
cls.hypervisor = cls.testClient.getHypervisorInfo() 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.hypervisorNotSupported = True
cls._cleanup = [] cls._cleanup = []

4
test/integration/smoke/test_vm_snapshots.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
# Import Local Modules # 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 nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.lib.utils import random_gen, cleanup_resources, validateList, is_snapshot_on_nfs 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.services = cls.testClient.getParsedTestDataConfig()
cls.unsupportedHypervisor = False cls.unsupportedHypervisor = False
cls.hypervisor = cls.testClient.getHypervisorInfo() 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 cls.unsupportedHypervisor = True
return return
# Get Domain, Zone, Template # Get Domain, Zone, Template