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 45781b9
Date Wed, 08 Jul 2015 06:26:13 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 4ad178e4b -> 45781b95b


CLOUDSTACK-8615 :skip all tests in test_ps_limits.py for lxc

CLOUDSTACK-8615 :skip all tests in test_ps_limits.py for lxc
This closes #565


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

Branch: refs/heads/master
Commit: 45781b95b993ad6f666e78e9871eeb4d5e8043ef
Parents: 4ad178e
Author: nitt10prashant <nitt10.prashant@gmail.com>
Authored: Tue Jul 7 17:00:19 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Wed Jul 8 11:54:47 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_ps_limits.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/45781b95/test/integration/component/test_ps_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ps_limits.py b/test/integration/component/test_ps_limits.py
index 1c815bf..8c75cb2 100644
--- a/test/integration/component/test_ps_limits.py
+++ b/test/integration/component/test_ps_limits.py
@@ -38,7 +38,8 @@ from marvin.lib.common import (get_domain,
                                get_template,
                                matchResourceCount,
                                createSnapshotFromVirtualMachineVolume,
-                               isVmExpunged)
+                               isVmExpunged,
+                               find_storage_pool_type)
 from marvin.lib.utils import (cleanup_resources,
                               validateList)
 from marvin.codes import (PASS,
@@ -63,6 +64,12 @@ class TestVolumeLimits(cloudstackTestCase):
         cls.domain = get_domain(cls.api_client)
         cls.zone = get_zone(cls.api_client, cloudstackTestClient.getZoneForTests())
         cls.services["mode"] = cls.zone.networktype
+        cls._cleanup = []
+        cls.unsupportedStorageType = False
+        if cls.hypervisor.lower() == 'lxc':
+            if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
+                cls.unsupportedStorageType = True
+                return
 
         cls.template = get_template(
                             cls.api_client,
@@ -73,7 +80,7 @@ class TestVolumeLimits(cloudstackTestCase):
         cls.services["virtual_machine"]["zoneid"] = cls.zone.id
         cls.services["virtual_machine"]["template"] = cls.template.id
         cls.services["volume"]["zoneid"] = cls.zone.id
-        cls._cleanup = []
+
         try:
             cls.service_offering = ServiceOffering.create(cls.api_client, cls.services["service_offering"])
             cls._cleanup.append(cls.service_offering)
@@ -92,6 +99,9 @@ class TestVolumeLimits(cloudstackTestCase):
         return
 
     def setUp(self):
+        if self.unsupportedStorageType:
+            self.skipTest(
+                "unsupported storage type")
         self.apiclient = self.testClient.getApiClient()
         self.dbclient = self.testClient.getDbConnection()
         self.cleanup = []


Mime
View raw message