[Pkg-bitcoin-commits] [bitcoin] 69/126: qa: Fix race condition in sendheaders.py

[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 adbc9d164a52736408a146294981cdba66de9755
Author: Suhas Daftuar <sdaftuar at chaincode.com>
Date:   Fri Oct 20 16:24:10 2017 -0400

    qa: Fix race condition in sendheaders.py
    
    Github-Pull: #11538
    Rebased-From: 6d51eaefe924bfaf2b0f4928dd6020023733480f
---
 test/functional/replace-by-fee.py | 6 ++++--
 test/functional/sendheaders.py    | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/functional/replace-by-fee.py b/test/functional/replace-by-fee.py
index 43005e9..1fd7c91 100755
--- a/test/functional/replace-by-fee.py
+++ b/test/functional/replace-by-fee.py
@@ -72,12 +72,14 @@ class ReplaceByFeeTest(BitcoinTestFramework):
                            ["-mempoolreplacement=0"]]
 
     def run_test(self):
-        # Leave IBD and ensure nodes are synced
+        # Leave IBD
         self.nodes[0].generate(1)
-        self.sync_all()
 
         make_utxo(self.nodes[0], 1*COIN)
 
+        # Ensure nodes are synced
+        self.sync_all()
+
         self.log.info("Running test simple doublespend...")
         self.test_simple_doublespend()
 
diff --git a/test/functional/sendheaders.py b/test/functional/sendheaders.py
index fe577dc..60d107b 100755
--- a/test/functional/sendheaders.py
+++ b/test/functional/sendheaders.py
@@ -225,6 +225,10 @@ class SendHeadersTest(BitcoinTestFramework):
         inv_node.wait_for_verack()
         test_node.wait_for_verack()
 
+        # Ensure verack's have been processed by our peer
+        inv_node.sync_with_ping()
+        test_node.sync_with_ping()
+
         tip = int(self.nodes[0].getbestblockhash(), 16)
 
         # PART 1

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