Updated Branches: refs/heads/simulator-storage-fixes [created] 838aa3588
Fix reviewboard messup of python indentation Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6af0ffec Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6af0ffec Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6af0ffec Branch: refs/heads/simulator-storage-fixes Commit: 6af0ffecf2763b1a4efe3f2a59ba390f405fde89 Parents: 4cf24f8 Author: Prasanna Santhanam <[email protected]> Authored: Wed Jun 26 17:12:54 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed Jun 26 19:11:26 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_routers.py | 64 ++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6af0ffec/test/integration/smoke/test_routers.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index 2e4553b..6fa08e0 100644 --- a/test/integration/smoke/test_routers.py +++ b/test/integration/smoke/test_routers.py @@ -171,7 +171,7 @@ class TestRouterServices(cloudstackTestCase): "Check list host returns a valid list" ) host = hosts[0] - + self.debug("Router ID: %s, state: %s" % (router.id, router.state)) self.assertEqual( @@ -180,32 +180,32 @@ class TestRouterServices(cloudstackTestCase): "Check list router response for router state" ) - if self.apiclient.hypervisor.lower() == 'vmware': - result = get_process_status( - self.apiclient.connection.mgtSvr, - 22, - self.apiclient.connection.user, - self.apiclient.connection.passwd, - router.linklocalip, - "service dnsmasq status", - hypervisor=self.apiclient.hypervisor - ) - else: - result = get_process_status( - host.ipaddress, - self.services['virtual_machine']["publicport"], - self.vm_1.username, - self.vm_1.password, - router.linklocalip, - "service dnsmasq status" - ) - res = str(result) - self.debug("Dnsmasq process status: %s" % res) + if self.apiclient.hypervisor.lower() == 'vmware': + result = get_process_status( + self.apiclient.connection.mgtSvr, + 22, + self.apiclient.connection.user, + self.apiclient.connection.passwd, + router.linklocalip, + "service dnsmasq status", + hypervisor=self.apiclient.hypervisor + ) + else: + result = get_process_status( + host.ipaddress, + self.services['virtual_machine']["publicport"], + self.vm_1.username, + self.vm_1.password, + router.linklocalip, + "service dnsmasq status" + ) + res = str(result) + self.debug("Dnsmasq process status: %s" % res) - self.assertEqual( - res.count("running"), - 1, - "Check dnsmasq service is running or not" + self.assertEqual( + res.count("running"), + 1, + "Check dnsmasq service is running or not" ) return @@ -253,7 +253,7 @@ class TestRouterServices(cloudstackTestCase): "Check list router response for router state" ) - if self.apiclient.hypervisor.lower() == 'vmware': + if self.apiclient.hypervisor.lower() == 'vmware': result = get_process_status( self.apiclient.connection.mgtSvr, 22, @@ -263,7 +263,7 @@ class TestRouterServices(cloudstackTestCase): "service dnsmasq status", hypervisor=self.apiclient.hypervisor ) - else: + else: result = get_process_status( host.ipaddress, self.services['virtual_machine']["publicport"], @@ -281,7 +281,7 @@ class TestRouterServices(cloudstackTestCase): "Check dnsmasq service is running or not" ) - if self.apiclient.hypervisor.lower() == 'vmware': + if self.apiclient.hypervisor.lower() == 'vmware': result = get_process_status( self.apiclient.connection.mgtSvr, 22, @@ -291,7 +291,7 @@ class TestRouterServices(cloudstackTestCase): "service haproxy status", hypervisor=self.apiclient.hypervisor ) - else: + else: result = get_process_status( host.ipaddress, self.services['virtual_machine']["publicport"], @@ -456,7 +456,7 @@ class TestRouterServices(cloudstackTestCase): ) host = hosts[0] - if self.apiclient.hypervisor.lower() == 'vmware': + if self.apiclient.hypervisor.lower() == 'vmware': res = get_process_status( self.apiclient.connection.mgtSvr, 22, @@ -466,7 +466,7 @@ class TestRouterServices(cloudstackTestCase): "uptime", hypervisor=self.apiclient.hypervisor ) - else: + else: res = get_process_status( host.ipaddress, self.services['virtual_machine']["publicport"],
