diff options
author | Jon Atack <jon@atack.com> | 2020-07-19 08:39:15 +0200 |
---|---|---|
committer | Jon Atack <jon@atack.com> | 2020-07-19 13:37:54 +0200 |
commit | 12410b1feb80189061eb4a2b43421e53cbb758a8 (patch) | |
tree | 247b5c69a3ee31c777ad9cd9d10a1330ba06f9c2 /test/functional/test_framework/test_framework.py | |
parent | 090d87716074434bdc6c7656ec44d049197a793a (diff) | |
download | bitcoin-12410b1feb80189061eb4a2b43421e53cbb758a8.tar.xz |
test: fix intermittent p2p_ibd_txrelay race, add test_framework.py#wait_until
Diffstat (limited to 'test/functional/test_framework/test_framework.py')
-rwxr-xr-x | test/functional/test_framework/test_framework.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py index 9d9e065158..8d402d4888 100755 --- a/test/functional/test_framework/test_framework.py +++ b/test/functional/test_framework/test_framework.py @@ -31,6 +31,7 @@ from .util import ( disconnect_nodes, get_datadir_path, initialize_datadir, + wait_until, ) @@ -602,6 +603,9 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass): self.sync_blocks(nodes) self.sync_mempools(nodes) + def wait_until(self, test_function, timeout=60, lock=None): + return wait_until(test_function, timeout=timeout, lock=lock, timeout_factor=self.options.timeout_factor) + # Private helper methods. These should not be accessed by the subclass test scripts. def _start_logging(self): |