[16/24] git commit: updated refs/heads/4.4 to e33d4a5

[da...@apache.org]

CLOUDSTACK-6760: skipping unsupported scale VM test on KVM

(cherry picked from commit 30bd9b8fe03a7162d67ec16b94846b0afb77fc2b)


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

Branch: refs/heads/4.4
Commit: 84ba19d0bcac2a8e8135fccd12e02a853f987f36
Parents: e51a9f1
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Mon May 26 19:23:41 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 17:43:25 2014 +0200

----------------------------------------------------------------------
 test/integration/smoke/test_scale_vm.py | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84ba19d0/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index 03d2e87..261fe93 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -34,6 +34,9 @@ class TestScaleVm(cloudstackTestCase):
         testClient = super(TestScaleVm, cls).getClsTestClient()
         cls.apiclient = testClient.getApiClient()
         cls.services = testClient.getParsedTestDataConfig()
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
+        if cls.hypervisor.lower() == 'kvm':
+            raise unittest.SkipTest("ScaleVM is not supported on KVM. Hence, skipping the test")
 
         # Get Zone, Domain and templates
         domain = get_domain(cls.apiclient)