Update safe_while users to reflect new defaults

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 79f0f5b9cd30ef8bd1373d5b92c793e11ff2ea10..e19f352ad02b8a4552035f301e6d7a271a85586c 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -821,7 +821,7 @@ def wait_until_healthy(ctx, remote):
     Wait until a Ceph cluster is healthy. Give up after 15min.
     """
     testdir = get_testdir(ctx)
-    with safe_while(sleep=5, increment=0, tries=180) as timeout:
+    with safe_while(tries=(900 / 6)) as timeout:
         while True:  # finite
             timeout()
             r = remote.run(

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index c8db4ee1d57058559f8aa0a0f4eaafe0c49648c5..0686fa72ee828fc55f7059984d5b776212ce27cd 100644 (file)
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -343,7 +343,7 @@ def wait(processes, timeout=None):
     Optionally, timeout after 'timeout' seconds.
     """
     if timeout and timeout > 0:
-        with safe_while(sleep=5, increment=0, tries=(timeout/5)) as check_time:
+        with safe_while(tries=(timeout / 6)) as check_time:
             not_ready = list(processes)
             while len(not_ready) > 0:
                 check_time()