diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2016-10-01 11:19:16 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-10-01 11:19:22 +0200 |
| commit | 6faffb8a83db3f209a303a4464dbdd597faad5a4 (patch) | |
| tree | 43ec57e3d56887d86af4feaded93120668916340 /qa | |
| parent | 7b784cc2bbcdc90361add2adb657c58162aca4ef (diff) | |
| parent | b5fd666984fdb7125cb809c773b36034f32128cc (diff) | |
| download | bitcoin-6faffb8a83db3f209a303a4464dbdd597faad5a4.tar.xz | |
Merge #8854: [qa] Fix race condition in p2p-compactblocks test
b5fd666 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/rpc-tests/p2p-compactblocks.py | 2 | ||||
| -rwxr-xr-x | qa/rpc-tests/test_framework/mininode.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qa/rpc-tests/p2p-compactblocks.py b/qa/rpc-tests/p2p-compactblocks.py index bf4fb43add..ac4655a841 100755 --- a/qa/rpc-tests/p2p-compactblocks.py +++ b/qa/rpc-tests/p2p-compactblocks.py @@ -237,6 +237,8 @@ class CompactBlocksTest(BitcoinTestFramework): for i in range(num_transactions): self.nodes[0].sendtoaddress(address, 0.1) + self.test_node.sync_with_ping() + # Now mine a block, and look at the resulting compact block. self.test_node.clear_block_announcement() block_hash = int(self.nodes[0].generate(1)[0], 16) diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index caffab3535..0b7b17cdb5 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -1536,7 +1536,7 @@ class SingleNodeConnCB(NodeConnCB): def received_pong(): return (self.last_pong.nonce == self.ping_counter) self.send_message(msg_ping(nonce=self.ping_counter)) - success = wait_until(received_pong, timeout) + success = wait_until(received_pong, timeout=timeout) self.ping_counter += 1 return success |