test: Give more time for servers to start

Also improve message in case of failure.

kedifa/test.py

@@ -157,8 +157,9 @@ class KedifaMixinCaucase(KedifaMixin):
     self.caucase_runtime.start()
     self.assertTrue(self.caucase_runtime.is_alive())
     self.caucase_url = 'http://[%s]:%s' % (ip, port)
-    # give some time for caucase to be available
-    for i in range(20):
+    # give 5s for caucase to be available
+    b = time.time()
+    for i in range(50):
       try:
         requests.get(self.caucase_url)
       except BaseException:
@@ -167,7 +168,8 @@ class KedifaMixinCaucase(KedifaMixin):
       else:
         break
     else:
-      raise
+      self.fail(
+        'Caucase not available after %.2fs seconds' % (time.time() - b))
 
   def setUpKey(self, common_name):
     # create key for the service and keep its downloaded ca_crt
@@ -232,8 +234,9 @@ class KedifaMixinCaucase(KedifaMixin):
     self.kedifa_runtime.start()
     self.assertTrue(self.kedifa_runtime.is_alive())
 
-    # give some time for KeDiFa to be available
-    for i in range(5):
+    # give 5s for KeDiFa to be available
+    b = time.time()
+    for i in range(50):
       try:
         self.requests_get(self.kedifa_url + 'ping')
       except BaseException:
@@ -241,7 +244,8 @@ class KedifaMixinCaucase(KedifaMixin):
       else:
         break
     else:
-      raise
+      self.fail(
+        'Kedifa not available after %.2fs seconds' % (time.time() - b))
 
     expected = 'Kedifa started at %s with pid %s stored in %s' % (
       self.kedifa_url, self.kedifa_runtime.pid, self.pidfile)