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 8E7E510844 for ; Thu, 1 Aug 2013 10:41:16 +0000 (UTC) Received: (qmail 30297 invoked by uid 500); 1 Aug 2013 10:41:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 30231 invoked by uid 500); 1 Aug 2013 10:41:15 -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 30214 invoked by uid 99); 1 Aug 2013 10:41:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Aug 2013 10:41:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E9DE38B5AC0; Thu, 1 Aug 2013 10:41:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tsp@apache.org To: commits@cloudstack.apache.org Date: Thu, 01 Aug 2013 10:41:15 -0000 Message-Id: <132b0ef0ecdd45a4b43a0cd8bb135867@git.apache.org> In-Reply-To: <8e49c015b76f4390810b98d8aaf52e56@git.apache.org> References: <8e49c015b76f4390810b98d8aaf52e56@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to d31fe92 CLOUDSTACK-3999: Fix the skipTest typo Signed-off-by: Prasanna Santhanam Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b303fd34 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b303fd34 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b303fd34 Branch: refs/heads/master Commit: b303fd34283f21afae1e2238fe5e484aef0fb91c Parents: 4b44899 Author: Prasanna Santhanam Authored: Thu Aug 1 16:09:07 2013 +0530 Committer: Prasanna Santhanam Committed: Thu Aug 1 16:10:57 2013 +0530 ---------------------------------------------------------------------- .../component/test_redundant_router_deployment_planning.py | 8 ++++---- test/integration/smoke/test_deploy_vm_with_userdata.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b303fd34/test/integration/component/test_redundant_router_deployment_planning.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_redundant_router_deployment_planning.py b/test/integration/component/test_redundant_router_deployment_planning.py index c8aac06..75fc3ab 100644 --- a/test/integration/component/test_redundant_router_deployment_planning.py +++ b/test/integration/component/test_redundant_router_deployment_planning.py @@ -233,7 +233,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): ) if len(pods) < 2: - raise self.SkipTest("The env don't have 2 pods req for test") + raise self.skipTest("The env don't have 2 pods req for test") # Creating network using the network offering created self.debug("Creating network with network offering: %s" % @@ -380,7 +380,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): "List clusters should not return empty response" ) if len(clusters) < 2: - raise self.SkipTest( + raise self.skipTest( "The env don't have 2 clusters req for test") self.debug("disable all pods except one!") @@ -600,7 +600,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): ) if len(storage_pools) < 2: - raise self.SkipTest( + raise self.skipTest( "The env don't have 2 storage pools req for test") self.debug("disable all pods except one!") @@ -841,7 +841,7 @@ class TestRvRDeploymentPlanning(cloudstackTestCase): ) if len(hosts) < 2: - raise self.SkipTest( + raise self.skipTest( "The env don't have 2 hosts req for test") self.debug("disable all pods except one!") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b303fd34/test/integration/smoke/test_deploy_vm_with_userdata.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py index 260106c..8910b2e 100644 --- a/test/integration/smoke/test_deploy_vm_with_userdata.py +++ b/test/integration/smoke/test_deploy_vm_with_userdata.py @@ -71,6 +71,7 @@ class TestDeployVmWithUserData(cloudstackTestCase): cls.services["service_offering"] ) cls.account = Account.create(cls.apiClient, services=cls.services["account"]) + cls.cleanup = [cls.account] cls.template = get_template( cls.apiClient, cls.zone.id, @@ -79,7 +80,7 @@ class TestDeployVmWithUserData(cloudstackTestCase): cls.debug("Successfully created account: %s, id: \ %s" % (cls.account.name,\ cls.account.id)) - cls.cleanup = [cls.account] + # Generate userdata of 2500 bytes. This is larger than the 2048 bytes limit. # CS however allows for upto 4K bytes in the code. So this must succeed.