[qa] Sort scripts by time for pull_tester and don't overwrite setup_chain

This commit is contained in:
MarcoFalke 2016-06-30 14:49:59 +02:00
parent 3685e0c1da
commit fae596f0e4
4 changed files with 17 additions and 9 deletions

View File

@ -110,6 +110,8 @@ testScripts = [
'receivedby.py', 'receivedby.py',
'mempool_resurrect_test.py', 'mempool_resurrect_test.py',
'txn_doublespend.py --mineblock', 'txn_doublespend.py --mineblock',
'p2p-segwit.py',
'segwit.py',
'txn_clone.py', 'txn_clone.py',
'getchaintips.py', 'getchaintips.py',
'rawtransactions.py', 'rawtransactions.py',
@ -131,13 +133,12 @@ testScripts = [
'disablewallet.py', 'disablewallet.py',
'sendheaders.py', 'sendheaders.py',
'keypool.py', 'keypool.py',
'p2p-mempool.py',
'prioritise_transaction.py', 'prioritise_transaction.py',
'invalidblockrequest.py', 'invalidblockrequest.py',
'invalidtxrequest.py', 'invalidtxrequest.py',
'abandonconflict.py', 'abandonconflict.py',
'p2p-versionbits-warning.py', 'p2p-versionbits-warning.py',
'p2p-segwit.py',
'segwit.py',
'importprunedfunds.py', 'importprunedfunds.py',
'signmessages.py', 'signmessages.py',
] ]

View File

@ -72,8 +72,11 @@ class TestNode(NodeConnCB):
self.send_message(msg_mempool()) self.send_message(msg_mempool())
class P2PMempoolTests(BitcoinTestFramework): class P2PMempoolTests(BitcoinTestFramework):
def setup_chain(self):
initialize_chain_clean(self.options.tmpdir, 2) def __init__(self):
super().__init__()
self.setup_clean_chain = True
self.num_nodes = 2
def setup_network(self): def setup_network(self):
# Start a node with maxuploadtarget of 200 MB (/24h) # Start a node with maxuploadtarget of 200 MB (/24h)

View File

@ -163,8 +163,11 @@ class UTXO(object):
class SegWitTest(BitcoinTestFramework): class SegWitTest(BitcoinTestFramework):
def setup_chain(self):
initialize_chain_clean(self.options.tmpdir, 3) def __init__(self):
super().__init__()
self.setup_clean_chain = True
self.num_nodes = 3
def add_options(self, parser): def add_options(self, parser):
parser.add_option("--oldbinary", dest="oldbinary", parser.add_option("--oldbinary", dest="oldbinary",

View File

@ -71,9 +71,10 @@ def getutxo(txid):
class SegWitTest(BitcoinTestFramework): class SegWitTest(BitcoinTestFramework):
def setup_chain(self): def __init__(self):
print("Initializing test directory "+self.options.tmpdir) super().__init__()
initialize_chain_clean(self.options.tmpdir, 3) self.setup_clean_chain = True
self.num_nodes = 3
def setup_network(self): def setup_network(self):
self.nodes = [] self.nodes = []