From fd1a71603fade1828661bc1f12b34acef07843ed Mon Sep 17 00:00:00 2001 From: Alex Brett Date: Mon, 18 Aug 2014 11:39:51 +0100 Subject: [PATCH] CLOUDSTACK-7363 test_vmware_drs.py should skip on non-VMWare hypervisors Make the tests check if the hypervisor being used is VMWare, and skip if not Signed-off-by: Santhosh Edukulla --- test/integration/component/test_vmware_drs.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py index 7d3ab7f5cb1..f33a056a3ae 100644 --- a/test/integration/component/test_vmware_drs.py +++ b/test/integration/component/test_vmware_drs.py @@ -112,6 +112,8 @@ class TestVMPlacement(cloudstackTestCase): def setUpClass(cls): cls.testClient = super(TestVMPlacement, cls).getClsTestClient() + if cls.testClient.getHypervisorInfo().lower() != "vmware": + raise unittest.SkipTest("VMWare tests only valid on VMWare hypervisor") cls.api_client = cls.testClient.getApiClient() cls.services = Services().services @@ -272,6 +274,8 @@ class TestAntiAffinityRules(cloudstackTestCase): def setUpClass(cls): cls.testClient = super(TestAntiAffinityRules, cls).getClsTestClient() + if cls.testClient.getHypervisorInfo().lower() != "vmware": + raise unittest.SkipTest("VMWare tests only valid on VMWare hypervisor") cls.api_client = cls.testClient.getApiClient() cls.services = Services().services @@ -500,6 +504,8 @@ class TestAffinityRules(cloudstackTestCase): def setUpClass(cls): cls.testClient = super(TestAffinityRules, cls).getClsTestClient() + if cls.testClient.getHypervisorInfo().lower() != "vmware": + raise unittest.SkipTest("VMWare tests only valid on VMWare hypervisor") cls.api_client = cls.testClient.getApiClient() cls.services = Services().services