From 7604a1b67086f94e93187c1f0dca39958403b2e9 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 7 Mar 2014 13:36:35 -0600 Subject: [PATCH] Update safe_while users to reflect new defaults Signed-off-by: Zack Cerza --- teuthology/misc.py | 2 +- teuthology/orchestra/run.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 79f0f5b9cd30e..e19f352ad02b8 100644 --- 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 c8db4ee1d5705..0686fa72ee828 100644 --- 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() -- 2.39.5