[Pkg-bitcoin-commits] [bitcoin] 68/126: qa: Fix replace-by-fee race condition failures

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.15.1_dfsg-1
in repository bitcoin.

commit fdad04e6170cfab5028b64a02a091c717795c65e
Author: Suhas Daftuar <sdaftuar at chaincode.com>
Date:   Fri Oct 20 16:10:08 2017 -0400

    qa: Fix replace-by-fee race condition failures
    
    Github-Pull: #11538
    Rebased-From: c96b2e4f096780c75e3fa8acba496d71322583a1
---
 test/functional/replace-by-fee.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/test/functional/replace-by-fee.py b/test/functional/replace-by-fee.py
index 5e1f339..43005e9 100755
--- a/test/functional/replace-by-fee.py
+++ b/test/functional/replace-by-fee.py
@@ -72,6 +72,10 @@ class ReplaceByFeeTest(BitcoinTestFramework):
                            ["-mempoolreplacement=0"]]
 
     def run_test(self):
+        # Leave IBD and ensure nodes are synced
+        self.nodes[0].generate(1)
+        self.sync_all()
+
         make_utxo(self.nodes[0], 1*COIN)
 
         self.log.info("Running test simple doublespend...")
@@ -110,13 +114,18 @@ class ReplaceByFeeTest(BitcoinTestFramework):
         """Simple doublespend"""
         tx0_outpoint = make_utxo(self.nodes[0], int(1.1*COIN))
 
+        # make_utxo may have generated a bunch of blocks, so we need to sync
+        # before we can spend the coins generated, or else the resulting
+        # transactions might not be accepted by our peers.
+        self.sync_all()
+
         tx1a = CTransaction()
         tx1a.vin = [CTxIn(tx0_outpoint, nSequence=0)]
         tx1a.vout = [CTxOut(1*COIN, CScript([b'a']))]
         tx1a_hex = txToHex(tx1a)
         tx1a_txid = self.nodes[0].sendrawtransaction(tx1a_hex, True)
 
-        self.sync_all([self.nodes])
+        self.sync_all()
 
         # Should fail because we haven't changed the fee
         tx1b = CTransaction()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/bitcoin.git