diff options
| author | MarcoFalke <[email protected]> | 2017-08-16 18:17:34 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2017-08-17 15:17:09 +0200 |
| commit | 08ce33f8e95efa81b37ddc6b3350462c61bbfd51 (patch) | |
| tree | 6aba3f369154013dc943169a89320fb8364af1a6 /test/functional/example_test.py | |
| parent | Merge #10901: Fix constness of ArgsManager methods (diff) | |
| download | discoin-08ce33f8e95efa81b37ddc6b3350462c61bbfd51.tar.xz discoin-08ce33f8e95efa81b37ddc6b3350462c61bbfd51.zip | |
qa: Move wait_until to util
Diffstat (limited to 'test/functional/example_test.py')
| -rwxr-xr-x | test/functional/example_test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/example_test.py b/test/functional/example_test.py index 79940a426..4f9e0a7dd 100755 --- a/test/functional/example_test.py +++ b/test/functional/example_test.py @@ -23,13 +23,13 @@ from test_framework.mininode import ( mininode_lock, msg_block, msg_getdata, - wait_until, ) from test_framework.test_framework import BitcoinTestFramework from test_framework.util import ( assert_equal, connect_nodes, p2p_port, + wait_until, ) # NodeConnCB is a class containing callbacks to be executed when a P2P @@ -209,7 +209,7 @@ class ExampleTest(BitcoinTestFramework): # wait_until() will loop until a predicate condition is met. Use it to test properties of the # NodeConnCB objects. - assert wait_until(lambda: sorted(blocks) == sorted(list(node2.block_receive_map.keys())), timeout=5) + wait_until(lambda: sorted(blocks) == sorted(list(node2.block_receive_map.keys())), timeout=5, lock=mininode_lock) self.log.info("Check that each block was received only once") # The network thread uses a global lock on data access to the NodeConn objects when sending and receiving |