cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [08/19] git commit: updated refs/heads/feature/vpc-ipv6 to c1b0900
Date Wed, 10 Jun 2015 20:49:48 GMT
Skipping all unsupported tests on LXC
This closes #379


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

Branch: refs/heads/feature/vpc-ipv6
Commit: 8f1e0510cd725eccfffc69e812fd45aeb59d8402
Parents: 6140db5
Author: Sanjeev Neelarapu <sanjeev.neelarapu@citrix.com>
Authored: Wed Jun 10 12:02:04 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Wed Jun 10 13:47:28 2015 +0530

----------------------------------------------------------------------
 test/integration/component/test_blocker_bugs.py  | 12 ++++++++++--
 test/integration/component/test_project_usage.py | 18 +++++++++++++-----
 test/integration/component/test_tags.py          |  2 ++
 test/integration/smoke/test_vm_life_cycle.py     |  0
 4 files changed, 25 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f1e0510/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index 7123984..663c97f 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -742,8 +742,10 @@ class TestTemplates(cloudstackTestCase):
                             cls.zone.id,
                             cls.services["ostype"]
                             )
+        cls.templateSupported = True
         if cls.hypervisor.lower() in ['lxc']:
-            raise unittest.SkipTest("Template creation from root volume is not supported
in LXC")
+            cls.templateSupported = False
+            return
         cls.services["virtual_machine"]["zoneid"] = cls.zone.id
         cls._cleanup = []
         try:
@@ -802,6 +804,8 @@ class TestTemplates(cloudstackTestCase):
         self.apiclient = self.testClient.getApiClient()
         self.dbclient = self.testClient.getDbConnection()
         self.cleanup = []
+        if not self.templateSupported:
+            self.skipTest("Template creation from root volume is not supported in LXC")
         return
 
     def tearDown(self):
@@ -1019,6 +1023,7 @@ class TestDataPersistency(cloudstackTestCase):
         cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
         cls.domain = get_domain(cls.api_client)
         cls.services['mode'] = cls.zone.networktype
+        cls.templateSupported = True
         template = get_template(
                             cls.api_client,
                             cls.zone.id,
@@ -1026,7 +1031,8 @@ class TestDataPersistency(cloudstackTestCase):
                             )
         cls.hypervisor = cls.testClient.getHypervisorInfo()
         if cls.hypervisor.lower() in ['lxc']:
-            raise unittest.SkipTest("Template creation from root volume is not supported
in LXC")
+            cls.templateSupported = False
+            return
         cls.services["virtual_machine"]["zoneid"] = cls.zone.id
 
         #Create an account, network, VM and IP addresses
@@ -1071,6 +1077,8 @@ class TestDataPersistency(cloudstackTestCase):
 
     def setUp(self):
         self.apiclient = self.testClient.getApiClient()
+        if not self.templateSupported:
+            self.skipTest("Template creation from root volume is not supported in LXC")
         return
 
     def tearDown(self):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f1e0510/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index b84c5e2..7c4fea6 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -511,9 +511,12 @@ class TestVolumeUsage(cloudstackTestCase):
         cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
         cls.services['mode'] = cls.zone.networktype
         cls.hypervisor = cls.testClient.getHypervisorInfo()
+        cls.rbdStorageFound = True
         if cls.hypervisor.lower() == 'lxc':
             if not find_storage_pool_type(cls.api_client, storagetype='rbd'):
-                raise unittest.SkipTest("RBD storage type is required for data volumes for
LXC")
+                cls.rbdStorageFound = False
+                return
+                #raise unittest.SkipTest("RBD storage type is required for data volumes for
LXC")
         cls.disk_offering = DiskOffering.create(
                                     cls.api_client,
                                     cls.services["disk_offering"]
@@ -575,6 +578,8 @@ class TestVolumeUsage(cloudstackTestCase):
         self.apiclient = self.testClient.getApiClient()
         self.dbclient = self.testClient.getDbConnection()
         self.cleanup = []
+        if not self.rbdStorageFound:
+            self.skipTest("")
         return
 
     def tearDown(self):
@@ -1258,16 +1263,17 @@ class TestSnapshotUsage(cloudstackTestCase):
     def setUpClass(cls):
         cls.testClient = super(TestSnapshotUsage, cls).getClsTestClient()
         cls.api_client = cls.testClient.getApiClient()
-
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
+        cls.snapshotSupported = True
+        if cls.hypervisor.lower() in ['hyperv', 'lxc']:
+            cls.snapshotSupported = False
+            return
         cls.services = Services().services
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
         cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
         cls.services['mode'] = cls.zone.networktype
         cls.hypervisor = cls.testClient.getHypervisorInfo()
-        if cls.hypervisor.lower() in ['lxc']:
-            raise unittest.SkipTest("snapshots are not supported on %s" % cls.hypervisor.lower())
-
         template = get_template(
                             cls.api_client,
                             cls.zone.id,
@@ -1324,6 +1330,8 @@ class TestSnapshotUsage(cloudstackTestCase):
         self.apiclient = self.testClient.getApiClient()
         self.dbclient = self.testClient.getDbConnection()
         self.cleanup = []
+        if not self.snapshotSupported:
+            self.skipTest("Snapshots are not supported on %s" % self.hypervisor)
         return
 
     def tearDown(self):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f1e0510/test/integration/component/test_tags.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py
index f0fe72c..3552064 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -2317,6 +2317,8 @@ class TestResourceTags(cloudstackTestCase):
         4.list hosts for migration for the above deployed vm
         5.All untagged hosts in the cluster must be listed as available hosts for vm migration
         """
+        if self.hypervisor.lower() in ['lxc']:
+            self.skipTest("Unsupported Hypervisor Type for User VM migration")
         tag = "tag1"
         clusters = list_clusters(self.apiclient, zoneid=self.zone.id)
         self.assertEqual(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8f1e0510/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
old mode 100644
new mode 100755


Mime
View raw message