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 32A6317487 for ; Thu, 5 Feb 2015 10:21:00 +0000 (UTC) Received: (qmail 35545 invoked by uid 500); 5 Feb 2015 10:21:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 35441 invoked by uid 500); 5 Feb 2015 10:21:00 -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 35425 invoked by uid 99); 5 Feb 2015 10:20:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2015 10:20:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D091EE040E; Thu, 5 Feb 2015 10:20:59 +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 Date: Thu, 05 Feb 2015 10:21:00 -0000 Message-Id: <475b83a59fd548689f0a8eff78ea662e@git.apache.org> In-Reply-To: <52efb4a31c764581a6523ad930cd2e30@git.apache.org> References: <52efb4a31c764581a6523ad930cd2e30@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 82b6c13 CLOUDSTACK-8214: test_netscaler_nw_off.py - Skip test if enough zones are not present instead of throwing exception Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8354d4a7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8354d4a7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8354d4a7 Branch: refs/heads/master Commit: 8354d4a765b98006192076b8c4ace045c36b0aa4 Parents: d62d511 Author: Gaurav Aradhye Authored: Wed Feb 4 22:40:37 2015 -0800 Committer: SrikanteswaraRao Talluri Committed: Thu Feb 5 15:50:51 2015 +0530 ---------------------------------------------------------------------- test/integration/component/test_netscaler_nw_off.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8354d4a7/test/integration/component/test_netscaler_nw_off.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py index 301c866..c2095a8 100644 --- a/test/integration/component/test_netscaler_nw_off.py +++ b/test/integration/component/test_netscaler_nw_off.py @@ -424,11 +424,9 @@ class TestAddMultipleNSDiffZone(cloudstackTestCase): for zone in zones: if zone.networktype == 'Advanced': zone_list.append(zone) - self.assertGreater( - len(zone_list), - 1, - "Atleast 2 advanced mode zones should be present for this test" - ) + if len(zone_list) < 2: + self.skipTest("Atleast 2 advanced mode zones should be present for this test") + zoneid=zone_list[0].id physical_networks = PhysicalNetwork.list( self.apiclient,