highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-24 09:41:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6414

Browse Source 
8a0b933 Fix intermittent test failure, reduce test time (Tom Harding)
This commit is contained in:
Wladimir J. van der Laan
2015-07-10 18:52:19 +02:00
parent fac21df5f0 8a0b933aae
commit 5121c68657
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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