From 3dae7bf165012fee695cce23e1060307bd1c6a41 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Mon, 15 Jun 2015 16:46:13 +0530 Subject: [PATCH] CLOUDSTACK-8527: Skipping VPC tests on HyperV --- .../integration/component/test_vpc_routers.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py index c27e4b2e3f39..fe9dc5d55202 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 @@ def tearDownClass(cls): 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 @@ def setUpClass(cls): 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 @@ def tearDownClass(cls): 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):