Repository: cloudstack Updated Branches: refs/heads/master 762f831c2 -> fd1a71603
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 <santhosh.eduku...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fd1a7160 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fd1a7160 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fd1a7160 Branch: refs/heads/master Commit: fd1a71603fade1828661bc1f12b34acef07843ed Parents: 762f831 Author: Alex Brett <alex.br...@citrix.com> Authored: Mon Aug 18 11:39:51 2014 +0100 Committer: Santhosh Edukulla <santhosh.eduku...@gmail.com> Committed: Mon Aug 18 22:16:47 2014 +0530 ---------------------------------------------------------------------- test/integration/component/test_vmware_drs.py | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fd1a7160/test/integration/component/test_vmware_drs.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py index 7d3ab7f..f33a056 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
