Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5518DF98E for ; Mon, 26 May 2014 13:57:06 +0000 (UTC) Received: (qmail 71562 invoked by uid 500); 26 May 2014 13:57:06 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71533 invoked by uid 500); 26 May 2014 13:57:06 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 71526 invoked by uid 99); 26 May 2014 13:57:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 May 2014 13:57:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F32E79A5610; Mon, 26 May 2014 13:57:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: talluri@apache.org To: commits@cloudstack.apache.org Message-Id: <7a474b546703468a95ff0d4fa6f3542b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to d0f806b Date: Mon, 26 May 2014 13:57:05 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 2218053fb -> d0f806b3a CLOUDSTACK-6760: skipping unsupported scale VM test on KVM Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0f806b3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0f806b3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0f806b3 Branch: refs/heads/master Commit: d0f806b3a486c58b033083fc57f39dd686e31750 Parents: 2218053 Author: SrikanteswaraRao Talluri Authored: Mon May 26 19:23:41 2014 +0530 Committer: SrikanteswaraRao Talluri Committed: Mon May 26 19:26:48 2014 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_scale_vm.py | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0f806b3/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 08f9ce5..f0ec534 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)