From b0bfa233a1bb74c2b59e627a9c3b76ac18ee6a31 Mon Sep 17 00:00:00 2001 From: John Newbery Date: Tue, 9 May 2017 08:54:58 -0400 Subject: [PATCH] [tests] Make wait_until timeout 60 seconds by default --- test/functional/test_framework/mininode.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 70bba566c..fb3ed1473 100755 --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -1358,6 +1358,8 @@ class msg_reject(object): # Helper function def wait_until(predicate, *, attempts=float('inf'), timeout=float('inf')): + if attempts == float('inf') and timeout == float('inf'): + timeout = 60 attempt = 0 elapsed = 0