erp5_bootstrap: add more connection controls

slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in

@@ -6,7 +6,7 @@ import base64
 import time
 
 MAX_INSTALLATION_TIME = 60*30
-MAX_TESTING_TIME = 60
+MAX_TESTING_TIME = 60*2
 MAX_GETTING_CONNECTION_TIME = 60*5
 
 user = "%(user)s"
@@ -35,20 +35,34 @@ def getConnection():
         raise ValueError("Protocol not implemented")
     except:
       print "Getting new connection failed, retry"
+      time.sleep(10)
   raise ValueError("Cannot get new connection after %%d try (for %%s s)" %%(count, str(time.time()-start_time)))
 
 def testIfExist(page, unexcepted_content="Site Error"):
   print "Test if %%s exists" %%(page)
+  start_time = time.time()
+  count = 0
+  while MAX_TESTING_TIME > time.time()-start_time:
+    try:
+      count = count + 1
       zope_connection = getConnection()
       zope_connection.request('GET', '/%%s/%%s' %%(site_id, page))
       result = zope_connection.getresponse()
       return not unexcepted_content in result.read()
+    except:
+      print "Test if exists failed, retry..."
+      time.sleep(10)
+  raise ValueError("Cannot testIfExist after %%d try (for %%s s)" %%(count, str(time.time()-start_time)))
+  
   
 def waitFor0PendingActivities():
   # TODO: tolerate 1 pending activities ? (mail server...)
   print "waitFor0PendingActivities.."
   start_time = time.time()
+  count = 0
   while MAX_INSTALLATION_TIME > time.time()-start_time:
+    try:
+      count = count + 1
       zope_connection = getConnection()
       zope_connection.request(
         'GET', '/%%s/portal_activities/getMessageList' %%(site_id),
@@ -69,6 +83,12 @@ def waitFor0PendingActivities():
         print "ok."
         break
         
+    except:
+      time.sleep(5)
+      print "Getting activities failed, retry."
+  raise ValueError("Cannot testIfExist after %%d try (for %%s s)" %%(count, str(time.time()-start_time)))
+
+
   
 # Check if an ERP5 site is already created, as ERP5 does support having
 # 2 instances in the same zope, and this script should not destroy user data