Merge pull request #1068 from AntelopeIO/GH-1055-waitForBlock

Test: Update waitForBlock
AntelopeIO · Dec 17, 2024 · 2c1f812 · 2c1f812
2 parents 7ae614b + 4b416ac
commit 2c1f812
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/tests/TestHarness/Node.py b/tests/TestHarness/Node.py
@@ -188,7 +188,7 @@ def waitForNextBlock(self, timeout=None, blockType=BlockType.head):
         return ret
 
     def waitForBlock(self, blockNum, timeout=None, blockType=BlockType.head, reportInterval=None):
-        lam = lambda: self.getBlockNum(blockType=blockType) > blockNum
+        lam = lambda: self.getBlockNum(blockType=blockType) >= blockNum
         blockDesc = "head" if blockType == BlockType.head else "LIB"
         count = 0
 

diff --git a/tests/disaster_recovery_2.py b/tests/disaster_recovery_2.py
@@ -105,7 +105,7 @@
 
     Print("Resume production on Node0")
     node0.processUrllibRequest("producer", "resume")
-    assert node0.waitForIrreversibleBlock(lib) # lib, not lib+1 because waitForIrreversibleBlock uses >
+    assert node0.waitForIrreversibleBlock(lib+1)
     libN = node0.getIrreversibleBlockNum()
     assert libN > lib
 

diff --git a/tests/disaster_recovery_3.py b/tests/disaster_recovery_3.py
@@ -96,8 +96,8 @@
         assert not node.verifyAlive(), "Node did not shutdown"
 
     Print("Wait for lib to advance to LIB N on other 2 nodes")
-    for node in [node2, node3]: # waitForBlock uses > not >=. node2 & node3 have lib of n_LIB
-        assert node.waitForBlock(n_LIB-1, timeout=None, blockType=BlockType.lib), "Node did not advance LIB after shutdown of node0 and node1"
+    for node in [node2, node3]:
+        assert node.waitForBlock(n_LIB, timeout=None, blockType=BlockType.lib), "Node did not advance LIB after shutdown of node0 and node1"
         currentLIB = node.getIrreversibleBlockNum()
         assert currentLIB == n_LIB, f"Node advanced LIB {currentLIB} beyond N LIB {n_LIB}"
 

diff --git a/tests/nodeos_forked_chain_test.py b/tests/nodeos_forked_chain_test.py
@@ -500,8 +500,8 @@ def getBlock(self, blockNum):
     Print("Tracking the blocks from the divergence till there are 10*12 blocks on one chain and 10*12+1 on the other, from block %d to %d" % (killBlockNum, lastBlockNum))
 
     for blockNum in range(killBlockNum,lastBlockNum):
-        blockProducer0=prodNodes[0].getBlockProducerByNum(blockNum)
-        blockProducer1=prodNodes[1].getBlockProducerByNum(blockNum)
+        blockProducer0=prodNodes[0].getBlockProducerByNum(blockNum, timeout=70)
+        blockProducer1=prodNodes[1].getBlockProducerByNum(blockNum, timeout=70)
         blockProducers0.append({"blockNum":blockNum, "prod":blockProducer0})
         blockProducers1.append({"blockNum":blockNum, "prod":blockProducer1})