use hard kill on nodeos

eosnetworkfoundation · Sep 23, 2024 · 6e5b6c7 · 6e5b6c7
1 parent ab17671
commit 6e5b6c7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/tests/nodeos_eos_evm_different_token_test.py b/tests/nodeos_eos_evm_different_token_test.py
@@ -1029,7 +1029,11 @@ def get_block(num):
     if eosEvmMinerPOpen is not None:
         Utils.Print("killing evm-miner")
         eosEvmMinerPOpen.kill()
-    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)        
-
+    Utils.Print("killing nodeos")
+    for node in cluster.nodes:
+        node.kill(signal.SIGKILL)
+    if len(cluster.nodes) and cluster.biosNode != cluster.nodes[0]:
+        cluster.biosNode.kill(signal.SIGKILL)
+
 exitCode = 0 if testSuccessful else 1
 exit(exitCode)
diff --git a/tests/nodeos_eos_evm_gasparam_fork_test.py b/tests/nodeos_eos_evm_gasparam_fork_test.py
@@ -1107,7 +1107,12 @@ def makeReservedEvmAddress(account):
     if wsproxy is not None:
         Utils.Print("killing web-socket proxy")
         wsproxy.kill()
-    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
+    Utils.Print("killing nodeos")
+    for node in cluster.nodes:
+        node.kill(signal.SIGKILL)
+    if len(cluster.nodes) and cluster.biosNode != cluster.nodes[0]:
+        cluster.biosNode.kill(signal.SIGKILL)
+    #TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
 
 exitCode = 0 if testSuccessful else 1
 exit(exitCode)
diff --git a/tests/nodeos_eos_evm_test.py b/tests/nodeos_eos_evm_test.py
@@ -1140,8 +1140,11 @@ def get_block(num):
     if eosEvmMinerPOpen is not None:
         Utils.Print("killing evm-miner")
         eosEvmMinerPOpen.kill()
-    Utils.Print("shutting down cluster")
-    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
-
+    Utils.Print("killing nodeos")
+    for node in cluster.nodes:
+        node.kill(signal.SIGKILL)
+    if len(cluster.nodes) and cluster.biosNode != cluster.nodes[0]:
+        cluster.biosNode.kill(signal.SIGKILL)
+
 exitCode = 0 if testSuccessful else 1
 exit(exitCode)
diff --git a/tests/nodeos_eos_evm_ws_test_basic.py b/tests/nodeos_eos_evm_ws_test_basic.py
@@ -796,7 +796,11 @@ def makeReservedEvmAddress(account):
     if wsproxy is not None:
         Utils.Print("killing web-socket proxy")
         wsproxy.kill()
-    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
-
+    Utils.Print("killing nodeos")
+    for node in cluster.nodes:
+        node.kill(signal.SIGKILL)
+    if len(cluster.nodes) and cluster.biosNode != cluster.nodes[0]:
+        cluster.biosNode.kill(signal.SIGKILL)
+
 exitCode = 0 if testSuccessful else 1
 exit(exitCode)
diff --git a/tests/nodeos_eos_evm_ws_test_fork.py b/tests/nodeos_eos_evm_ws_test_fork.py
@@ -1104,9 +1104,12 @@ def makeReservedEvmAddress(account):
     if wsproxy is not None:
         Utils.Print("killing web-socket proxy")
         wsproxy.kill()
-    Utils.Print("shutting down cluster")
-    TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
-
+    Utils.Print("killing nodeos")
+    for node in cluster.nodes:
+        node.kill(signal.SIGKILL)
+    if len(cluster.nodes) and cluster.biosNode != cluster.nodes[0]:
+        cluster.biosNode.kill(signal.SIGKILL)
+
 Utils.Print("exit eos evm web-socket fork test")
 exitCode = 0 if testSuccessful else 1
 exit(exitCode)