diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-29 18:04:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-29 18:10:57 +0200 |
| commit | a6ed99a1e6facd38913711106bce6fb65bd14862 (patch) | |
| tree | 6b6220f2d44a9e1ec696ee98c0890ca7c2913f9a /test/functional/p2p_segwit.py | |
| parent | f3c9c40aeb1207c5839fcb642addc243b8a8b34e (diff) | |
| parent | fa87da2f172ae2e6dc15e9ed156a3564a8ecfbdd (diff) | |
| download | bitcoin-a6ed99a1e6facd38913711106bce6fb65bd14862.tar.xz | |
Merge #13517: qa: Remove need to handle the network thread in tests
fa87da2f172ae2e6dc15e9ed156a3564a8ecfbdd qa: Avoid start/stop of the network thread mid-test (MarcoFalke)
Pull request description:
This simplifies test writing by removing the need to handle the network thread in tests. E.g. start thread, join thread, restart thread mid-test, adding p2p connections at the "right" time, ...
Tree-SHA512: 533642f12fef5496f1933855edcdab1a7ed901d088d34911749cd0f9e044c8a6cb1f89985ac3a7f41a512943663e4e270a61978f6f072143ae050cd102d4eab8
Diffstat (limited to 'test/functional/p2p_segwit.py')
| -rwxr-xr-x | test/functional/p2p_segwit.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/functional/p2p_segwit.py b/test/functional/p2p_segwit.py index 940d085e89..a2b86ff82d 100755 --- a/test/functional/p2p_segwit.py +++ b/test/functional/p2p_segwit.py @@ -1964,9 +1964,8 @@ class SegWitTest(BitcoinTestFramework): self.utxo.pop(0) - def run_test(self): - # Setup the p2p connections and start up the network thread. + # Setup the p2p connections # self.test_node sets NODE_WITNESS|NODE_NETWORK self.test_node = self.nodes[0].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK|NODE_WITNESS) # self.old_node sets only NODE_NETWORK @@ -1974,8 +1973,6 @@ class SegWitTest(BitcoinTestFramework): # self.std_node is for testing node1 (fRequireStandard=true) self.std_node = self.nodes[1].add_p2p_connection(TestP2PConn(), services=NODE_NETWORK|NODE_WITNESS) - network_thread_start() - # Keep a place to store utxo's that can be used in later tests self.utxo = [] |