test: fix flaky ibc and versiondb integration tests (#2071)

* test: fix flaky ibc and versiondb integration tests

* add changelog

* fmt

Author: songgaoye

CHANGELOG.md

@@ -24,6 +24,7 @@
 * [#2068](https://github.com/crypto-org-chain/cronos/pull/2068) fix(ante): enforce eip-1559 cost balance check even if it is not checkTx.
 * [#2070](https://github.com/crypto-org-chain/cronos/pull/2070) fix(ci): fix github pr labeler to match v6 format.
 * [#2069](https://github.com/crypto-org-chain/cronos/pull/2069) fix(test): flaky test_mempool integration test.
+* [#2071](https://github.com/crypto-org-chain/cronos/pull/2071) fix(test): fix flaky ibc and versiondb integration tests.
 
 ### Chores:
 * [#1986](https://github.com/crypto-org-chain/cronos/pull/1986) Remove unused precompiles

integration_tests/ibc_utils.py

@@ -775,6 +775,7 @@ def check_tx():
     if timeout is None:
         wait_for_fn("transfer tx", check_tx)
     else:
+        raised = False
         try:
             print(f"should assert timeout err when pass {timeout}s")
             wait_for_fn("transfer tx", check_tx, timeout=timeout)
@@ -793,6 +794,7 @@ def check_status():
     if timeout is None:
         wait_for_fn("current status", check_status)
     else:
+        raised = False
         try:
             print(f"should assert timeout err when pass {timeout}s")
             wait_for_fn("current status", check_status, timeout=timeout)

integration_tests/test_versiondb.py

@@ -5,7 +5,13 @@
 from pystarport import ports
 
 from .network import Cronos
-from .utils import ADDRS, send_transaction, w3_wait_for_new_blocks, wait_for_port
+from .utils import (
+    ADDRS,
+    send_transaction,
+    w3_wait_for_block,
+    w3_wait_for_new_blocks,
+    wait_for_port,
+)
 
 
 def test_versiondb_migration(cronos: Cronos):
@@ -85,6 +91,10 @@ def test_versiondb_migration(cronos: Cronos):
     )
     for i in range(len(cronos.config["validators"])):
         wait_for_port(ports.evmrpc_port(cronos.base_port(i)))
+    # wait for consensus to be stable after restart
+    w3_wait_for_new_blocks(w3, 2)
+    # ensure the node has replayed up to block1 before historical queries
+    w3_wait_for_block(w3, block1)
 
     assert w3.eth.get_balance(community, block_identifier=block0) == balance0
     assert w3.eth.get_balance(community, block_identifier=block1) == balance1