aboutsummaryrefslogtreecommitdiff
path: root/qa/pull-tester/rpc-tests.py
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-06-21 10:24:09 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-06-21 10:24:19 +0200
commit0d41d705c83d68d67c6ee499e80e062077ba86d7 (patch)
treec6462e72d3df169972df4a8f50f712120c1ce477 /qa/pull-tester/rpc-tests.py
parentbf9c70b1008e1eada462955a6420e79a7d2a8352 (diff)
parentfa58f94ff7f097260ebee791008dab368c7ac318 (diff)
downloadbitcoin-0d41d705c83d68d67c6ee499e80e062077ba86d7.tar.xz
Merge #8216: [qa] assert 'changePosition out of bounds'
fa58f94 [qa] pull-tester: Start longest test first (MarcoFalke) fa3b379 [qa] pull-tester: Fix assertion and check for run_parallel (MarcoFalke) fa32465 [qa] fundrawtransaction: Create get_unspent() (MarcoFalke) fa8ce3b [qa] assert 'changePosition out of bounds' (MarcoFalke)
Diffstat (limited to 'qa/pull-tester/rpc-tests.py')
-rwxr-xr-xqa/pull-tester/rpc-tests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 57a576f1c7..6c0ed4510f 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -101,6 +101,8 @@ if ENABLE_ZMQ:
#Tests
testScripts = [
+ # longest test should go first, to favor running tests in parallel
+ 'p2p-fullblocktest.py',
'walletbackup.py',
'bip68-112-113-p2p.py',
'wallet.py',
@@ -125,7 +127,6 @@ testScripts = [
'nodehandling.py',
'reindex.py',
'decodescript.py',
- 'p2p-fullblocktest.py',
'blockchain.py',
'disablewallet.py',
'sendheaders.py',
@@ -191,7 +192,7 @@ def runtests():
if coverage:
flags.append(coverage.flag)
- if len(test_list) > 1:
+ if len(test_list) > 1 and run_parallel > 1:
# Populate cache
subprocess.check_output([RPC_TESTS_DIR + 'create_cache.py'] + flags)
@@ -251,7 +252,7 @@ class RPCTestHandler:
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)))
if not self.jobs:
- raise IndexError('%s from empty list' % __name__)
+ raise IndexError('pop from empty list')
while True:
# Return first proc that finishes
time.sleep(.5)