cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 897ea3d
Date Thu, 18 Jun 2015 10:13:06 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a5a1818d2 -> 897ea3db7


CLOUDSTACK-8527: Skipping VPC tests on HyperV

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>

This closes #458


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

Branch: refs/heads/master
Commit: 897ea3db7623f69cbbfd6999d0d9e9229c8667e9
Parents: a5a1818
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Mon Jun 15 16:46:13 2015 +0530
Committer: Daan Hoogland <daan.hoogland@gmail.com>
Committed: Thu Jun 18 12:12:46 2015 +0200

----------------------------------------------------------------------
 test/integration/component/test_vpc_routers.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/897ea3db/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index c27e4b2..fe9dc5d 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -193,7 +193,12 @@ class TestVPCRoutersBasic(cloudstackTestCase):
     def setUpClass(cls):
         cls.testClient = super(TestVPCRoutersBasic, cls).getClsTestClient()
         cls.api_client = cls.testClient.getApiClient()
-
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
+        cls.vpcSupported = True
+        cls._cleanup = []
+        if cls.hypervisor.lower() == 'hyperv':
+            cls.vpcSupported = False
+            return
         cls.services = Services().services
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
@@ -252,7 +257,8 @@ class TestVPCRoutersBasic(cloudstackTestCase):
 
     def setUp(self):
         self.api_client = self.testClient.getApiClient()
-
+        if not self.vpcSupported:
+            self.skipTest("VPC is not supported on %s" % self.hypervisor)
         return
 
     def tearDown(self):
@@ -627,7 +633,12 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
         cls._cleanup = []
         cls.testClient = super(TestVPCRouterOneNetwork, cls).getClsTestClient()
         cls.api_client = cls.testClient.getApiClient()
-
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
+        cls.vpcSupported = True
+        cls._cleanup = []
+        if cls.hypervisor.lower() == 'hyperv':
+            cls.vpcSupported = False
+	    return
         cls.services = Services().services
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.api_client)
@@ -851,6 +862,8 @@ class TestVPCRouterOneNetwork(cloudstackTestCase):
     def setUp(self):
         self.api_client = self.testClient.getApiClient()
         self.cleanup = []
+        if not self.vpcSupported:
+            self.skipTest("VPC is not supported on %s" % self.hypervisor)
         return
 
     def tearDown(self):


Mime
View raw message