sync_blocks: check that peer is connected when calling sync_*.

furszy · furszy · commit dd7855c2ff48 · 2020-07-03T18:43:03.000-03:00
Coming from btc@fac3716b09bb9ee121db629873d9694a95cae942
diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py
@@ -385,6 +385,8 @@ def sync_blocks(rpc_connections, *, wait=1, timeout=60):
         best_hash = [x.getbestblockhash() for x in rpc_connections]
         if best_hash.count(best_hash[0]) == len(rpc_connections):
             return
+        # 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)))
 
@@ -401,6 +403,8 @@ def sync_mempools(rpc_connections, *, wait=1, timeout=60, flush_scheduler=True):
             #    for r in rpc_connections:
             #        r.syncwithvalidationinterfacequeue()
             return
+        # 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)))
 
