CLOUDSTACK-2542: Fix router test for basic zone Signed-off-by: Prasanna Santhanam <t...@apache.org>
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 <srikanteswararao.tall...@citrix.com> Authored: Thu May 16 17:29:12 2013 +0530 Committer: Prasanna Santhanam <t...@apache.org> 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,
