Browse Source

Merge pull request #6414

8a0b933 Fix intermittent test failure, reduce test time (Tom Harding)
tags/v0.15.1
Wladimir J. van der Laan 5 years ago
parent
commit
5121c68657
No account linked to committer's email address
2 changed files with 5 additions and 3 deletions
  1. 2
    2
      qa/pull-tester/rpc-tests.sh
  2. 3
    1
      qa/rpc-tests/txn_clone.py

+ 2
- 2
qa/pull-tester/rpc-tests.sh View File

@@ -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'

+ 3
- 1
qa/rpc-tests/txn_clone.py View File

@@ -125,6 +125,8 @@ class TxnMallTest(BitcoinTestFramework):

# Reconnect the split network, and sync chain:
connect_nodes(self.nodes[1], 2)
self.nodes[2].sendrawtransaction(fund_bar_tx["hex"])
self.nodes[2].sendrawtransaction(tx2["hex"])
self.nodes[2].generate(1) # Mine another block to make sure we sync
sync_blocks(self.nodes)

@@ -136,7 +138,7 @@ class TxnMallTest(BitcoinTestFramework):
# Verify expected confirmations
assert_equal(tx1["confirmations"], -1)
assert_equal(tx1_clone["confirmations"], 2)
assert_equal(tx2["confirmations"], 0)
assert_equal(tx2["confirmations"], 1)

# Check node0's total balance; should be same as before the clone, + 100 BTC for 2 matured,
# less possible orphaned matured subsidy

Loading…
Cancel
Save