GH-1837 Allow a couple of start blocks per block as forks cause multiple

AntelopeIO · Oct 31, 2023 · 79dccc5 · 79dccc5
1 parent 1dac3fb
commit 79dccc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tests/TestHarness/Node.py b/tests/TestHarness/Node.py
@@ -550,12 +550,13 @@ def findInLog(self, searchStr):
                         return True
         return False
 
-    # verify only one 'Starting block' per block number unless block is restarted
-    def verifyOnlyOneStartingBlock(self):
+    # verify only one or two 'Starting block' per block number unless block is restarted
+    def verifyStartingBlockMessages(self):
         dataDir=Utils.getNodeDataDir(self.nodeId)
         files=Node.findStderrFiles(dataDir)
         for f in files:
             blockNumbers = set()
+            duplicateBlockNumbers = set()
             duplicatesFound = False
             lastRestartBlockNum = 0
 
@@ -569,9 +570,11 @@ def verifyOnlyOneStartingBlock(self):
                     match = re.match(r".*Starting block #(\d+)", line)
                     if match:
                         blockNumber = match.group(1)
-                        if blockNumber != lastRestartBlockNum and blockNumber in blockNumbers:
+                        if blockNumber != lastRestartBlockNum and blockNumber in duplicateBlockNumbers:
                             print(f"Duplicate Staring block found: {blockNumber} in {f}")
                             duplicatesFound = True
+                        if blockNumber != lastRestartBlockNum and blockNumber in blockNumbers:
+                            duplicateBlockNumbers.add(blockNumber)
                         blockNumbers.add(blockNumber)
 
             if duplicatesFound:

diff --git a/tests/distributed-transactions-test.py b/tests/distributed-transactions-test.py
@@ -113,7 +113,7 @@
 
     # verify only one start block per block unless interrupted
     for node in cluster.getAllNodes():
-        if not node.verifyOnlyOneStartingBlock():
+        if not node.verifyStartingBlockMessages():
             errorExit("Found more than one Starting block in logs")
 
     testSuccessful=True