Wait for nodes to sync masternode data during p2p-fullblocktest

tgflynn · tgflynn · commit a9ddf6f4207d · 2016-08-19T00:58:48.000-04:00
diff --git a/qa/rpc-tests/invalidblockrequest.py b/qa/rpc-tests/invalidblockrequest.py
@@ -34,6 +34,7 @@ def run_test(self):
         self.tip = None
         self.block_time = None
         NetworkThread().start() # Start up network handling in another thread
+        sync_masternodes(self.nodes)
         test.run()
 
     def get_tests(self):
diff --git a/qa/rpc-tests/p2p-fullblocktest.py b/qa/rpc-tests/p2p-fullblocktest.py
@@ -44,6 +44,7 @@ def run_test(self):
         test = TestManager(self, self.options.tmpdir)
         test.add_all_connections(self.nodes)
         NetworkThread().start() # Start up network handling in another thread
+        sync_masternodes(self.nodes)
         test.run()
 
     def add_transactions_to_block(self, block, tx_list):
diff --git a/qa/rpc-tests/test_framework/util.py b/qa/rpc-tests/test_framework/util.py
@@ -55,6 +55,15 @@ def get_rpc_proxy(url, node_number, timeout=None):
 
     return coverage.AuthServiceProxyWrapper(proxy, coverage_logfile)
 
+def get_mnsync_status(node):
+    result = node.mnsync("status")
+    return result['IsSynced']
+
+def wait_to_sync(node):
+    synced = False
+    while not synced:
+        synced = get_mnsync_status(node)
+        time.sleep(0.5)
 
 def p2p_port(n):
     return 11000 + n + os.getpid()%999
@@ -96,6 +105,10 @@ def sync_mempools(rpc_connections, wait=1):
             break
         time.sleep(wait)
 
+def sync_masternodes(rpc_connections):
+    for node in rpc_connections:
+        wait_to_sync(node)
+
 bitcoind_processes = {}
 
 def initialize_datadir(dirname, n):
