diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-12 12:52:33 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-12 13:09:52 +0100 |
| commit | ad1820cbad15c4eb4e2c86ac8032d0fb1b7b7c35 (patch) | |
| tree | 308324eaa7fb21e00753fde70c7ee9c45a8da956 /test/functional/p2p-fingerprint.py | |
| parent | d48ab83f00538a5135b2c448809260a9d46ca31c (diff) | |
| parent | 5c8ff26b2fc59d8bcfa2a8bfb7c9fe6d78cf6678 (diff) | |
| download | bitcoin-ad1820cbad15c4eb4e2c86ac8032d0fb1b7b7c35.tar.xz | |
Merge #11849: [tests] Assert that only one NetworkThread exists
5c8ff26 [tests] Add NetworkThread assertions (John Newbery)
34e08b3 [tests] Fix network threading in functional tests (John Newbery)
74e64f2 [tests] Use network_thread_start() in tests. (John Newbery)
5fc6e71 [tests] Add network_thread_ utility functions. (John Newbery)
Pull request description:
Add assert that only one NetworkThread exists at any time in functional tests, and fix cases where that wasn't true.
fixes #11776
Tree-SHA512: fe5d1c59005f94bf66e11bb23ccf274b1cd9913741b56ea11dbcd21db4cc0b53b4413c0c4c16dbcd6ac611adad5e5cc2baaa39720598ce7b6393889945d06298
Diffstat (limited to 'test/functional/p2p-fingerprint.py')
| -rwxr-xr-x | test/functional/p2p-fingerprint.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/p2p-fingerprint.py b/test/functional/p2p-fingerprint.py index 209c789f22..93ef73e25e 100755 --- a/test/functional/p2p-fingerprint.py +++ b/test/functional/p2p-fingerprint.py @@ -13,12 +13,12 @@ import time from test_framework.blocktools import (create_block, create_coinbase) from test_framework.mininode import ( CInv, - NetworkThread, P2PInterface, msg_headers, msg_block, msg_getdata, msg_getheaders, + network_thread_start, wait_until, ) from test_framework.test_framework import BitcoinTestFramework @@ -77,7 +77,7 @@ class P2PFingerprintTest(BitcoinTestFramework): def run_test(self): node0 = self.nodes[0].add_p2p_connection(P2PInterface()) - NetworkThread().start() + network_thread_start() node0.wait_for_verack() # Set node time to 60 days ago |