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 EE261DB99 for ; Sat, 18 May 2013 12:56:38 +0000 (UTC) Received: (qmail 91295 invoked by uid 500); 18 May 2013 12:56:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 91168 invoked by uid 500); 18 May 2013 12:56:30 -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 90022 invoked by uid 99); 18 May 2013 12:56:27 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 May 2013 12:56:27 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 04FB4319376; Sat, 18 May 2013 12:56:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Sat, 18 May 2013 12:57:03 -0000 Message-Id: <37229a0330c5453ca4372cbc3a216518@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] git commit: updated refs/heads/rbd-snap-clone to bc82173 CLOUDSTACK-2542: Fix router test for basic zone 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/2867c6a6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2867c6a6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2867c6a6 Branch: refs/heads/rbd-snap-clone Commit: 2867c6a6df6fe552cd8cf1f8bb7447bf8084d859 Parents: 55d304a Author: SrikanteswaraRao Talluri Authored: Thu May 16 17:29:12 2013 +0530 Committer: Prasanna Santhanam Committed: Fri May 17 14:05:58 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_routers.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2867c6a6/test/integration/smoke/test_routers.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index 9ec2e91..f6ca279 100644 --- a/test/integration/smoke/test_routers.py +++ b/test/integration/smoke/test_routers.py @@ -141,11 +141,17 @@ class TestRouterServices(cloudstackTestCase): # by checking status of dnsmasq process # Find router associated with user account - list_router_response = list_routers( - self.apiclient, - account=self.account.name, - domainid=self.account.domainid - ) + if self.zone.networktype == "Basic": + list_router_response = list_routers( + self.apiclient, + listall="true" + ) + else: + list_router_response = list_routers( + self.apiclient, + account=self.account.name, + domainid=self.account.domainid + ) self.assertEqual( isinstance(list_router_response, list), True,