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/feature_maxuploadtarget.py | |
parent | f3c9c40aeb1207c5839fcb642addc243b8a8b34e (diff) | |
parent | fa87da2f172ae2e6dc15e9ed156a3564a8ecfbdd (diff) |
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/feature_maxuploadtarget.py')
-rwxr-xr-x | test/functional/feature_maxuploadtarget.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/functional/feature_maxuploadtarget.py b/test/functional/feature_maxuploadtarget.py index 0946f27b90..c413ecf705 100755 --- a/test/functional/feature_maxuploadtarget.py +++ b/test/functional/feature_maxuploadtarget.py @@ -57,7 +57,6 @@ class MaxUploadTest(BitcoinTestFramework): for _ in range(3): p2p_conns.append(self.nodes[0].add_p2p_connection(TestP2PConn())) - network_thread_start() for p2pc in p2p_conns: p2pc.wait_for_verack() @@ -148,8 +147,6 @@ class MaxUploadTest(BitcoinTestFramework): # Reconnect to self.nodes[0] self.nodes[0].add_p2p_connection(TestP2PConn()) - - network_thread_start() self.nodes[0].p2p.wait_for_verack() #retrieve 20 blocks which should be enough to break the 1MB limit |