diff options
| author | John Newbery <john@johnnewbery.com> | 2017-05-09 08:54:58 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2017-05-09 08:55:13 -0400 |
| commit | b0bfa233a1bb74c2b59e627a9c3b76ac18ee6a31 (patch) | |
| tree | 10deb8f1c937bbb1e31a9144a437bc09414a13d7 /test/functional | |
| parent | 6a796b2b53fe542e0f340f250f4f20d69efed8d0 (diff) | |
| download | bitcoin-b0bfa233a1bb74c2b59e627a9c3b76ac18ee6a31.tar.xz | |
[tests] Make wait_until timeout 60 seconds by default
Diffstat (limited to 'test/functional')
| -rwxr-xr-x | test/functional/test_framework/mininode.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py index 70bba566c7..fb3ed1473a 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 |