Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Test only, don't merge] test web-socket fork test instablity #295

Closed
wants to merge 3 commits into from
Closed

[Test only, don't merge] test web-socket fork test instablity #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a762416
test web-socket fork test instablity
taokayan Sep 17, 2024
ab17671
shutdown order fix
taokayan Sep 20, 2024
6e5b6c7
use hard kill on nodeos
taokayan Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions tests/nodeos_eos_evm_different_token_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,15 +1020,20 @@ def get_block(num):

testSuccessful= not foundErr
finally:
TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
if killEosInstances:
if evmNodePOpen is not None:
evmNodePOpen.kill()
if evmRPCPOpen is not None:
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
eosEvmMinerPOpen.kill()
if evmNodePOpen is not None:
Utils.Print("killing eos-evm-node")
evmNodePOpen.kill()
if evmRPCPOpen is not None:
Utils.Print("killing eos-evm-rpc")
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
Utils.Print("killing evm-miner")
eosEvmMinerPOpen.kill()
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)
28 changes: 18 additions & 10 deletions tests/nodeos_eos_evm_gasparam_fork_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,16 +1095,24 @@ def makeReservedEvmAddress(account):

testSuccessful= not foundErr
finally:
TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
if killEosInstances:
if evmNodePOpen is not None:
evmNodePOpen.kill()
if evmRPCPOpen is not None:
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
eosEvmMinerPOpen.kill()
if wsproxy is not None:
wsproxy.kill()
if evmNodePOpen is not None:
Utils.Print("killing eos-evm-node")
evmNodePOpen.kill()
if evmRPCPOpen is not None:
Utils.Print("killing eos-evm-rpc")
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
Utils.Print("killing evm-miner")
eosEvmMinerPOpen.kill()
if wsproxy is not None:
Utils.Print("killing web-socket proxy")
wsproxy.kill()
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)
25 changes: 14 additions & 11 deletions tests/nodeos_eos_evm_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,17 +1131,20 @@ def get_block(num):
Utils.Print("test failed, ready to shut down cluster")

finally:
Utils.Print("shutting down cluster")
TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
if killEosInstances:
Utils.Print("killing EOS instances")
if evmNodePOpen is not None:
evmNodePOpen.kill()
if evmRPCPOpen is not None:
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
eosEvmMinerPOpen.kill()
if evmNodePOpen is not None:
Utils.Print("killing eos-evm-node")
evmNodePOpen.kill()
if evmRPCPOpen is not None:
Utils.Print("killing eos-evm-rpc")
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
Utils.Print("killing evm-miner")
eosEvmMinerPOpen.kill()
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)
29 changes: 18 additions & 11 deletions tests/nodeos_eos_evm_ws_test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,16 +784,23 @@ def makeReservedEvmAddress(account):
except Exception as ex:
Utils.Print("Exception:" + str(ex))
finally:
TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
if killEosInstances:
if evmNodePOpen is not None:
evmNodePOpen.kill()
if evmRPCPOpen is not None:
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
eosEvmMinerPOpen.kill()
if wsproxy is not None:
wsproxy.kill()

if evmNodePOpen is not None:
Utils.Print("killing eos-evm-node")
evmNodePOpen.kill()
if evmRPCPOpen is not None:
Utils.Print("killing eos-evm-rpc")
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
Utils.Print("killing evm-miner")
eosEvmMinerPOpen.kill()
if wsproxy is not None:
Utils.Print("killing web-socket proxy")
wsproxy.kill()
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)
32 changes: 21 additions & 11 deletions tests/nodeos_eos_evm_ws_test_fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,22 +1084,32 @@ def makeReservedEvmAddress(account):

blockProducers0=[]
blockProducers1=[]

Utils.Print("closing websocket")
ws.close()

testSuccessful= not foundErr
except Exception as ex:
Utils.Print("Exception:" + str(ex))
finally:
TestHelper.shutdown(cluster, walletMgr, testSuccessful=testSuccessful, dumpErrorDetails=dumpErrorDetails)
if killEosInstances:
if evmNodePOpen is not None:
evmNodePOpen.kill()
if evmRPCPOpen is not None:
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
eosEvmMinerPOpen.kill()
if wsproxy is not None:
wsproxy.kill()

if evmNodePOpen is not None:
Utils.Print("killing eos-evm-node")
evmNodePOpen.kill()
if evmRPCPOpen is not None:
Utils.Print("killing eos-evm-rpc")
evmRPCPOpen.kill()
if eosEvmMinerPOpen is not None:
Utils.Print("killing evm-miner")
eosEvmMinerPOpen.kill()
if wsproxy is not None:
Utils.Print("killing web-socket proxy")
wsproxy.kill()
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)
Loading