Merge #8041: [qa] Fix bip9-softforks blockstore issue

fad60b3 [qa] Fix bip9-softforks blockstore issue (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2016-05-12 11:41:37 +02:00 committed by Alexander Block
parent 4ee3858426
commit f0fe21d372

View File

@ -3,6 +3,7 @@
# Distributed under the MIT software license, see the accompanying # Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
from test_framework.blockstore import BlockStore
from test_framework.test_framework import ComparisonTestFramework from test_framework.test_framework import ComparisonTestFramework
from test_framework.util import * from test_framework.util import *
from test_framework.mininode import CTransaction, NetworkThread from test_framework.mininode import CTransaction, NetworkThread
@ -192,11 +193,13 @@ class BIP9SoftForksTest(ComparisonTestFramework):
yield TestInstance([[block, False]]) yield TestInstance([[block, False]])
# Restart all # Restart all
self.test.block_store.close()
stop_nodes(self.nodes) stop_nodes(self.nodes)
wait_bitcoinds() wait_bitcoinds()
shutil.rmtree(self.options.tmpdir) shutil.rmtree(self.options.tmpdir)
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.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() # Start up network handling in another thread