Repository: cloudstack Updated Branches: refs/heads/master dacdf9742 -> 166df0f15
CLOUDSTACK-8394: Skipping recurring snapshot test cases for Hyperv and LXC Signed-off-by: Gaurav Aradhye <gaurav.arad...@clogeny.com> This closes #267 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/166df0f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/166df0f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/166df0f1 Branch: refs/heads/master Commit: 166df0f153c46cc0098757e0493b32b45a1da8cc Parents: dacdf97 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Wed May 20 11:32:16 2015 +0530 Committer: Gaurav Aradhye <gaurav.arad...@clogeny.com> Committed: Wed May 20 11:36:15 2015 +0530 ---------------------------------------------------------------------- .../component/test_recurring_snapshots.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/166df0f1/test/integration/component/test_recurring_snapshots.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_recurring_snapshots.py b/test/integration/component/test_recurring_snapshots.py index 9912fda..9d3c618 100644 --- a/test/integration/component/test_recurring_snapshots.py +++ b/test/integration/component/test_recurring_snapshots.py @@ -144,6 +144,14 @@ class TestRecurringSnapshots(cloudstackTestCase): cls.testClient = super(TestRecurringSnapshots, cls).getClsTestClient() cls.api_client = cls.testClient.getApiClient() + cls._cleanup = [] + + cls.unsupportedHypervisor = False + cls.hypervisor = cls.testClient.getHypervisorInfo() + if cls.hypervisor.lower() in ['hyperv', "lxc"]: + cls.unsupportedHypervisor = True + return + cls.services = Services().services # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client) @@ -153,6 +161,7 @@ class TestRecurringSnapshots(cloudstackTestCase): cls.api_client, cls.services["disk_offering"] ) + cls._cleanup.append(cls.disk_offering) template = get_template( cls.api_client, cls.zone.id, @@ -175,6 +184,7 @@ class TestRecurringSnapshots(cloudstackTestCase): cls.services["account"], domainid=cls.domain.id ) + cls._cleanup.append(cls.account) cls.services["account"] = cls.account.name @@ -182,6 +192,7 @@ class TestRecurringSnapshots(cloudstackTestCase): cls.api_client, cls.services["service_offering"] ) + cls._cleanup.append(cls.service_offering) cls.virtual_machine_with_disk = \ VirtualMachine.create( cls.api_client, @@ -200,11 +211,6 @@ class TestRecurringSnapshots(cloudstackTestCase): domainid=cls.account.domainid, serviceofferingid=cls.service_offering.id ) - cls._cleanup = [ - cls.service_offering, - cls.disk_offering, - cls.account, - ] return @classmethod @@ -220,6 +226,9 @@ class TestRecurringSnapshots(cloudstackTestCase): self.apiclient = self.testClient.getApiClient() self.dbclient = self.testClient.getDbConnection() self.cleanup = [] + + if self.unsupportedHypervisor: + self.skipTest("Snapshots feature is not supported on Hyper-V/LXC") return def tearDown(self):
