cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject git commit: updated refs/heads/master to 69f239a
Date Wed, 29 Apr 2015 06:00:38 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6dfb8ab03 -> 69f239aff


CLOUDSTACK-8394: Skipping download ISO tests for simulator

Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #207


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

Branch: refs/heads/master
Commit: 69f239afffdb8e9cd6e8d698d65cecbb609d7021
Parents: 6dfb8ab
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Wed Apr 29 11:28:18 2015 +0530
Committer: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Committed: Wed Apr 29 11:30:17 2015 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_iso.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/69f239af/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index c5e5f31..8841699 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -19,7 +19,7 @@
 # Import Local Modules
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.cloudstackAPI import listZones, updateIso, extractIso, updateIsoPermissions,
copyIso, deleteIso
-from marvin.lib.utils import cleanup_resources, random_gen
+from marvin.lib.utils import cleanup_resources, random_gen, get_hypervisor_type
 from marvin.lib.base import Account, Iso
 from marvin.lib.common import (get_domain,
                                get_zone,
@@ -147,6 +147,12 @@ class TestISO(cloudstackTestCase):
         testClient = super(TestISO, cls).getClsTestClient()
         cls.apiclient = testClient.getApiClient()
         cls.services = testClient.getParsedTestDataConfig()
+        cls._cleanup = []
+        cls.unsupportedHypervisor = False
+        cls.hypervisor = get_hypervisor_type(cls.apiclient)
+        if cls.hypervisor == "simulator":
+            cls.unsupportedHypervisor = True
+            return
 
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.apiclient)
@@ -168,6 +174,7 @@ class TestISO(cloudstackTestCase):
             cls.services["account"],
             domainid=cls.domain.id
         )
+        cls._cleanup.append(cls.account)
         # Finding the OsTypeId from Ostype
         ostypes = list_os_types(
             cls.apiclient,
@@ -203,8 +210,6 @@ class TestISO(cloudstackTestCase):
         except Exception as e:
             raise Exception("Exception while downloading ISO %s: %s"
                             % (cls.iso_2.id, e))
-
-        cls._cleanup = [cls.account]
         return
 
     @classmethod
@@ -226,6 +231,10 @@ class TestISO(cloudstackTestCase):
         self.dbclient = self.testClient.getDbConnection()
         self.cleanup = []
 
+        if self.unsupportedHypervisor:
+            self.skipTest("Skipping test because unsupported hypervisor\
+                    %s" % self.hypervisor)
+
     def tearDown(self):
         try:
             # Clean up, terminate the created ISOs, VMs


Mime
View raw message