aboutsummaryrefslogtreecommitdiff
path: root/qa/pull-tester
diff options
context:
space:
mode:
authorTom Harding <tomh@thinlink.com>2015-07-09 18:10:57 -0700
committerTom Harding <tomh@thinlink.com>2015-07-09 18:10:57 -0700
commit8a0b933aaed45b8d58aaba5bd9a904bb7105cf08 (patch)
tree934d1d56a596f0c09a5a6583d9f20f6c9fa07ef5 /qa/pull-tester
parent7fc25c2e5d493f4ef46c9b5831d92886bcea17a8 (diff)
downloadbitcoin-8a0b933aaed45b8d58aaba5bd9a904bb7105cf08.tar.xz
Fix intermittent test failure, reduce test time
In txn_clone.py, non-essential test transaction tx2 was asserted to be unconfirmed, but would occasionally confirm depending on network behavior. Fix by explicitly sharing with miner and checking for 1 confirmation. Reduce required conflict tests from 4 to 2, by moving one invocation each of txn_clone.py and txn_doublespend.py to the extented test section. This saves about 15 seconds per test run for me.
Diffstat (limited to 'qa/pull-tester')
-rwxr-xr-xqa/pull-tester/rpc-tests.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
index b282082395..0ef1b1eda8 100755
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -19,10 +19,8 @@ testScripts=(
'wallet.py'
'listtransactions.py'
'mempool_resurrect_test.py'
- 'txn_doublespend.py'
'txn_doublespend.py --mineblock'
'txn_clone.py'
- 'txn_clone.py --mineblock'
'getchaintips.py'
'rawtransactions.py'
'rest.py'
@@ -44,6 +42,8 @@ testScriptsExt=(
'bipdersig.py'
'getblocktemplate_longpoll.py'
'getblocktemplate_proposals.py'
+ 'txn_doublespend.py'
+ 'txn_clone.py --mineblock'
'pruning.py'
'forknotify.py'
'invalidateblock.py'