cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject git commit: updated refs/heads/master to fabbfe5
Date Wed, 27 May 2015 13:19:14 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7563ed46f -> fabbfe5f9


If storage pool of type RBD is not found then skip the tests for LXC
This closes #320


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fabbfe5f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fabbfe5f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fabbfe5f

Branch: refs/heads/master
Commit: fabbfe5f9a39bf350757a88aeddb06f413a6fb84
Parents: 7563ed4
Author: sanjeev <sanjeev@apache.org>
Authored: Wed May 27 17:06:40 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Wed May 27 18:48:29 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_escalations_volumes.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fabbfe5f/test/integration/component/test_escalations_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_volumes.py b/test/integration/component/test_escalations_volumes.py
index 58f5845..83e0e71 100644
--- a/test/integration/component/test_escalations_volumes.py
+++ b/test/integration/component/test_escalations_volumes.py
@@ -46,9 +46,11 @@ class TestVolumes(cloudstackTestCase):
             cls.api_client = cls.testClient.getApiClient()
             cls.services = cls.testClient.getParsedTestDataConfig()
             cls.hypervisor = cls.testClient.getHypervisorInfo()
+            cls.find_storage_pool = True
             if cls.hypervisor.lower() == 'lxc':
-                if not find_storage_pool_type(cls.apiclient, storagetype='rbd'):
-                    raise unittest.SkipTest("RBD storage type is required for data volumes
for LXC")
+                if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
+                    cls.find_storage_pool = False
+                    return
             # Get Domain, Zone, Template
             cls.domain = get_domain(cls.api_client)
             cls.zone = get_zone(
@@ -94,6 +96,8 @@ class TestVolumes(cloudstackTestCase):
 
     def setUp(self):
 
+        if not self.find_storage_pool:
+            self.skipTest("Skipping tests since RBD storage type is required for data volumes
for LXC")
         self.apiClient = self.testClient.getApiClient()
         self.account = Account.create(
             self.apiClient,


Mime
View raw message