Skip to content

Commit 32d74e6

Browse files
committed
Bound nodeos cleanup waits in test harness
1 parent d06d401 commit 32d74e6

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

tests/TestHarness/Node.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,13 @@ def kill(self, killSignal):
298298
try:
299299
if self.popenProc is not None:
300300
self.popenProc.send_signal(killSignal)
301-
self.popenProc.wait()
301+
try:
302+
self.popenProc.wait(timeout=60)
303+
except subprocess.TimeoutExpired:
304+
Utils.Print("WARNING: Node %s did not exit after signal %s; sending SIGKILL." % (self.nodeId, killSignal))
305+
self.popenProc.kill()
306+
self.popenProc.wait(timeout=30)
307+
return False
302308
elif self.pid is not None:
303309
os.kill(self.pid, killSignal)
304310

0 commit comments

Comments
 (0)