aboutsummaryrefslogtreecommitdiff
path: root/qa/rpc-tests
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-07-10 18:52:19 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-07-10 18:52:43 +0200
commit5121c68657fb90baa50b709adcc48348c4876783 (patch)
tree33ec4ff3f1a4cb67ab623851f87f8f570c208732 /qa/rpc-tests
parentfac21df5f00d1d84d9c1c251d273f2e8070877ec (diff)
parent8a0b933aaed45b8d58aaba5bd9a904bb7105cf08 (diff)
downloadbitcoin-5121c68657fb90baa50b709adcc48348c4876783.tar.xz
Merge pull request #6414
8a0b933 Fix intermittent test failure, reduce test time (Tom Harding)
Diffstat (limited to 'qa/rpc-tests')
-rwxr-xr-xqa/rpc-tests/txn_clone.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/rpc-tests/txn_clone.py b/qa/rpc-tests/txn_clone.py
index 0d276ecc91..e8ced0e5bb 100755
--- a/qa/rpc-tests/txn_clone.py
+++ b/qa/rpc-tests/txn_clone.py
@@ -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