From 6d51eaefe924bfaf2b0f4928dd6020023733480f Mon Sep 17 00:00:00 2001
From: Suhas Daftuar <sdaftuar@chaincode.com>
Date: Fri, 20 Oct 2017 16:24:10 -0400
Subject: [PATCH] qa: Fix race condition in sendheaders.py

---
 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 17667b0bc..815e96484 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 fe577dc20..60d107b24 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