cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/4.3 to 53f0d35
Date Fri, 27 Dec 2013 05:26:10 GMT
Updated Branches:
  refs/heads/4.3 818807b2e -> 53f0d3551


CLOUDSTACK-5638: Fixed code to check router state


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/53f0d355
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/53f0d355
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/53f0d355

Branch: refs/heads/4.3
Commit: 53f0d35517ff717950120d2cb4206d50fbed13de
Parents: 818807b
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Fri Dec 27 10:53:42 2013 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Fri Dec 27 10:55:53 2013 +0530

----------------------------------------------------------------------
 test/integration/component/test_routers.py | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/53f0d355/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index 5f1ebc6..f8359f0 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -350,16 +350,31 @@ class TestRouterServices(cloudstackTestCase):
                              "Check list router response"
                              )
         # Router associated with account should be in running state
-        for router in routers:
-            self.debug("Router ID: %s & Router state: %s" % (
+        timeout = 180
+        router = routers[0]
+        self.debug("Router ID: %s & Router state: %s" % (
                                                              router.id,
                                                              router.state
                                                              ))
-            self.assertEqual(
+        self.debug("Wait for %s secs max for router to reach Running state" % timeout)
+        while timeout:
+            time.sleep(60)
+            routers = list_routers(
+                               self.apiclient,
+                               account=self.account.name,
+                               domainid=self.account.domainid,
+                               id=router.id)
+            router = routers[0]
+            if router.state == 'Running':
+                break
+
+            timeout = timeout - 60
+            if timeout == 0:
+                self.assertEqual(
                         router.state,
                         'Running',
-                        "Check list router response for router state"
-                    )
+                        "Router not in Running state")
+
 
         # Network state associated with account should be 'Implemented'
         networks = list_networks(


Mime
View raw message