sync_blocks: Increase debugging to hunt down mempool_reorg intermitte…

…nt failure Coming from btc@fac2fc4dd8a28b99e17c57e4ab6580a3231f1d0a
PIVX-Project · Jul 3, 2020 · 38efbb9 · 38efbb9
1 parent dd7855c
commit 38efbb9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/test/functional/mempool_reorg.py b/test/functional/mempool_reorg.py
@@ -18,8 +18,6 @@ def set_test_params(self):
         self.num_nodes = 2
         self.extra_args = [["-checkmempool"]] * 2
 
-    alert_filename = None  # Set by setup_network
-
     def run_test(self):
         # Start with a 200 block chain
         assert_equal(self.nodes[0].getblockcount(), 200)
@@ -74,9 +72,8 @@ def run_test(self):
         spend_101_id = self.nodes[0].sendrawtransaction(spend_101_raw)
         spend_102_1_id = self.nodes[0].sendrawtransaction(spend_102_1_raw)
 
-        self.sync_all()
-
         assert_equal(set(self.nodes[0].getrawmempool()), {spend_101_id, spend_102_1_id})
+        self.sync_all()
 
         for node in self.nodes:
             node.invalidateblock(last_block[0])
@@ -91,6 +88,7 @@ def run_test(self):
 
         # mempool should be empty.
         assert_equal(set(self.nodes[0].getrawmempool()), set())
+        self.sync_all()
 
 if __name__ == '__main__':
     MempoolCoinbaseTest().main()
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
@@ -388,7 +388,10 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
         # Check that each peer has at least one connection
         assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
         time.sleep(wait)
-    raise AssertionError("Block sync timed out:{}".format("".join("\n  {!r}".format(b) for b in best_hash)))
+    raise AssertionError("Block sync timed out after {}s:{}".format(
+        timeout,
+        "".join("\n  {!r}".format(b) for b in best_hash),
+    ))
 
 def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True):
     """
@@ -406,8 +409,10 @@ def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True):
         # Check that each peer has at least one connection
         assert (all([len(x.getpeerinfo()) for x in rpc_connections]))
         time.sleep(wait)
-    raise AssertionError("Mempool sync timed out:{}".format("".join("\n  {!r}".format(m) for m in pool)))
-
+    raise AssertionError("Mempool sync timed out after {}s:{}".format(
+        timeout,
+        "".join("\n  {!r}".format(m) for m in pool),
+    ))
 
 # Transaction/Block functions
 #############################