tier two functional test: wait_until_mnsync_finished advancing the clock on every fail sync attempt.

furszy · furszy · commit 572c8717d540 · 2020-11-05T10:55:10.000-03:00
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
@@ -1124,12 +1124,13 @@ def wait_until_mnsync_finished(self):
         SYNC_FINISHED = [999] * self.num_nodes
         synced = [-1] * self.num_nodes
         time.sleep(2)
-        timeout = time.time() + 300
+        timeout = time.time() + 45
         while synced != SYNC_FINISHED and time.time() < timeout:
             for i in range(self.num_nodes):
                 if synced[i] != SYNC_FINISHED[i]:
                     synced[i] = self.nodes[i].mnsync("status")["RequestedMasternodeAssets"]
             if synced != SYNC_FINISHED:
+                self.advance_mocktime(2)
                 time.sleep(5)
         if synced != SYNC_FINISHED:
             raise AssertionError("Unable to complete mnsync: %s" % str(synced))
@@ -1379,6 +1380,8 @@ def setup_2_masternodes_network(self):
         self.log.info("masternodes setup completed, initializing them..")
 
         # now both are configured, let's activate the masternodes
+        self.stake(1)
+        time.sleep(3)
         self.advance_mocktime(10)
         remoteOnePort = p2p_port(self.remoteTwoPos)
         remoteTwoPort = p2p_port(self.remoteOnePos)
diff --git a/test/functional/tiertwo_governance_sync_basic.py b/test/functional/tiertwo_governance_sync_basic.py
@@ -132,7 +132,7 @@ def run_test(self):
         self.log.info("all good, MN2 vote accepted everywhere!")
 
         # Quick block count check.
-        assert_equal(self.ownerOne.getblockcount(), 275)
+        assert_equal(self.ownerOne.getblockcount(), 276)
 
         self.log.info("starting budget finalization sync test..")
         self.stake(5, [self.remoteOne, self.remoteTwo])
