You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2015/05/27 09:15:55 UTC
git commit: updated refs/heads/master to dce34ad
Repository: cloudstack
Updated Branches:
refs/heads/master 39e2590a7 -> dce34ad74
Skip snapshot tests since it is not supported on LXC
This closes #314
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dce34ad7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dce34ad7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dce34ad7
Branch: refs/heads/master
Commit: dce34ad7477f9f56ae3be3c07e4447a8ca4748bc
Parents: 39e2590
Author: sanjeev <sa...@apache.org>
Authored: Wed May 27 12:39:40 2015 +0530
Committer: sanjeev <sa...@apache.org>
Committed: Wed May 27 12:45:31 2015 +0530
----------------------------------------------------------------------
test/integration/component/test_escalations_snapshots.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dce34ad7/test/integration/component/test_escalations_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_snapshots.py b/test/integration/component/test_escalations_snapshots.py
index 0645909..bad419a 100644
--- a/test/integration/component/test_escalations_snapshots.py
+++ b/test/integration/component/test_escalations_snapshots.py
@@ -40,9 +40,11 @@ class TestSnapshots(cloudstackTestCase):
cls.testClient = super(TestSnapshots, cls).getClsTestClient()
cls.api_client = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
+ cls.unsupportedHypervisor = False
cls.hypervisor = cls.testClient.getHypervisorInfo()
- if cls.hypervisor.lower() == 'lxc':
- raise unittest.SkipTest("snapshots are not supported on %s" % cls.hypervisor.lower())
+ if cls.hypervisor.lower() in ("lxc"):
+ cls.unsupportedHypervisor = True
+ return
# Get Domain, Zone, Template
cls.domain = get_domain(cls.api_client)
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
@@ -102,6 +104,8 @@ class TestSnapshots(cloudstackTestCase):
self.apiClient = self.testClient.getApiClient()
self.cleanup = []
+ if self.unsupportedHypervisor:
+ self.skipTest("Snapshots are not supported on %s" %self.hypervisor)
def tearDown(self):
# Clean up, terminate the created resources