You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2013/12/27 06:24:32 UTC

git commit: updated refs/heads/master to ec8610f

Updated Branches:
  refs/heads/master 8455a0677 -> ec8610f75


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/ec8610f7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec8610f7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec8610f7

Branch: refs/heads/master
Commit: ec8610f7566b74ea36399db020007fb878d013eb
Parents: 8455a06
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Fri Dec 27 10:53:42 2013 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Fri Dec 27 10:53:42 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/ec8610f7/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(