Wait for connection to open in bip9-softforks.py

bip9-sofforks.py stop-starts the bitcoind node twice during the test
run, but it doesn't wait for the connection from mininode to open before
continuing with the test. This leads to race conditions where the test
can fail getblocktemplate() because it has no p2p connections.
This commit is contained in:
John Newbery 2017-03-24 16:14:13 -04:00
parent 0b9fb68289
commit 1f3d78b4e0

View File

@ -200,16 +200,14 @@ class BIP9SoftForksTest(ComparisonTestFramework):
yield TestInstance([[block, False]]) yield TestInstance([[block, False]])
# Restart all # Restart all
self.test.block_store.close() self.test.clear_all_connections()
stop_nodes(self.nodes) stop_nodes(self.nodes)
shutil.rmtree(self.options.tmpdir) shutil.rmtree(self.options.tmpdir + "/node0")
self.setup_chain() self.setup_chain()
self.setup_network() self.setup_network()
self.test.block_store = BlockStore(self.options.tmpdir)
self.test.clear_all_connections()
self.test.add_all_connections(self.nodes) self.test.add_all_connections(self.nodes)
NetworkThread().start() # Start up network handling in another thread NetworkThread().start()
self.test.test_nodes[0].wait_for_verack()
def get_tests(self): def get_tests(self):
for test in itertools.chain( for test in itertools.chain(