Enhancements to 3-node cluster tests

[integration/test.git] / test / csit / libraries / ClusterStateLibrary.py

diff --git a/test/csit/libraries/ClusterStateLibrary.py b/test/csit/libraries/ClusterStateLibrary.py
index 1255623ac73d77568092d9d9c4ddd0d4a2116eca..8f25e415d77e4195aa83485268a5462f185df487 100644 (file)
--- a/test/csit/libraries/ClusterStateLibrary.py
+++ b/test/csit/libraries/ClusterStateLibrary.py
@@ -34,6 +34,7 @@ def getClusterRoles(shardName,numOfShards=3,numOfTries=3,sleepBetweenRetriesInSe
                 resp = UtilLibrary.get(url)
                 print resp
                 if(resp.status_code != 200):
+                    sleep(sleepBetweenRetriesInSecs)
                     continue
                 data = json.loads(resp.text)
                 if('value' in data):
@@ -76,10 +77,11 @@ def isLeader(shardName,numOfShards,numOfRetries,sleepFor,port,ipAddress):
 # Or None
 #
 def getLeader(shardName,numOfShards=3,numOfTries=3,sleepBetweenRetriesInSecs=1,port=8181,*ips):
-    dict = getClusterRoles(shardName,numOfShards,numOfTries,sleepBetweenRetriesInSecs,port,*ips)
-    for ip in dict.keys():
-        if(dict[ip]=='Leader'):
-             return ip
+    for i in range(3): # Try 3 times to find a leader
+        dict = getClusterRoles(shardName,numOfShards,numOfTries,sleepBetweenRetriesInSecs,port,*ips)
+        for ip in dict.keys():
+            if(dict[ip]=='Leader'):
+                return ip
 
     return None