Added exitOnError flag to Cluster.getNode.

tests/Cluster.py

@@ -429,7 +429,13 @@ def populateWallet(self, accountsCount, wallet):
         self.accounts=accounts
         return True
 
-    def getNode(self, nodeId=0):
+    def getNode(self, nodeId=0, exitOnError=True):
+        if exitOnError and nodeId >= len(self.nodes):
+            Utils.cmdError("cluster never created node %d" % (nodeId))
+            errorExit("Failed to retrieve node %d" % (nodeId))
+        if exitOnError and self.nodes[nodeId] is None:
+            Utils.cmdError("cluster has None value for node %d" % (nodeId))
+            errorExit("Failed to retrieve node %d" % (nodeId))
         return self.nodes[nodeId]
 
     def getNodes(self):

tests/consensus-validation-malicious-producers.py

@@ -277,9 +277,6 @@ def myTest(transWillEnterBlock):
 
         node=cluster.getNode(0)
         node2=cluster.getNode(1)
-        if node is None or node2 is None:
-            error("Cluster in bad state, received None node")
-            return False
 
         defproduceraAccount=testUtils.Cluster.defproduceraAccount
 

tests/nodeos_run_test.py

@@ -202,8 +202,6 @@
         errorExit("FAILURE - wallet keys did not include %s" % (noMatch), raw=True)
 
     node=cluster.getNode(0)
-    if node is None:
-        errorExit("Cluster in bad state, received None node")
 
     Print("Validating accounts before user accounts creation")
     cluster.validateAccounts(None)

tests/nodeos_under_min_avail_ram.py

@@ -113,17 +113,9 @@ def setName(self, num):
 
     nodes=[]
     nodes.append(cluster.getNode(0))
-    if nodes[0] is None:
-        errorExit("Cluster in bad state, received None node")
     nodes.append(cluster.getNode(1))
-    if nodes[1] is None:
-        errorExit("Cluster in bad state, received None node")
     nodes.append(cluster.getNode(2))
-    if nodes[2] is None:
-        errorExit("Cluster in bad state, received None node")
     nodes.append(cluster.getNode(3))
-    if nodes[3] is None:
-        errorExit("Cluster in bad state, received None node")
 
 
     for account in accounts:

tests/nodeos_voting_test.py

@@ -250,17 +250,9 @@ def verifyProductionRounds(trans, node, prodsActive, rounds):
             trans=node.regproducer(cluster.defProducerAccounts[prod], "http::/mysite.com", 0, waitForTransBlock=False, exitOnError=True)
 
     node0=cluster.getNode(0)
-    if node0 is None:
-        errorExit("Cluster in bad state, received None node")
     node1=cluster.getNode(1)
-    if node1 is None:
-        errorExit("Cluster in bad state, received None node")
     node2=cluster.getNode(2)
-    if node2 is None:
-        errorExit("Cluster in bad state, received None node")
     node3=cluster.getNode(3)
-    if node3 is None:
-        errorExit("Cluster in bad state, received None node")
 
     node=node0
     # create accounts via eosio as otherwise a bid is needed

tests/p2p_network_test.py

@@ -137,16 +137,14 @@
      errorExit("Failed to import key for account %s" % (defproduceraAccount.name))
 
 node0=cluster.getNode(0)
-if node0 is None:
-    errorExit("cluster in bad state, received None node")
 
 # eosio should have the same key as defproducera
 eosio = copy.copy(defproduceraAccount)
 eosio.name = "eosio"
 
 Print("Info of each node:")
 for i in range(len(hosts)):
-    node = cluster.getNode(0)
+    node = node0
     cmd="%s %s get info" % (testUtils.Utils.EosClientPath, node.endpointArgs)
     trans = node.runCmdReturnJson(cmd)
     Print("host %s: %s" % (hosts[i], trans))

tests/validate-dirty-db.py

@@ -78,8 +78,6 @@ def runNodeosAndGetOutput(myTimeout=3):
         errorExit("Failed to stand up eos cluster.")
 
     node=cluster.getNode(0)
-    if node is None:
-        errorExit("Cluster in bad state, received None node")
 
     Print("Kill cluster nodes.")
     cluster.killall(allInstances=killAll)