Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Commit

Permalink
Fixed interruptAndVerifyExitStatus to track that it was killed. GH #6727
Browse files Browse the repository at this point in the history
.
  • Loading branch information
brianjohnson5972 committed Mar 23, 2019
1 parent 640257e commit fcd01c8
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion tests/Node.py
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,10 @@ def interruptAndVerifyExitStatus(self, timeout=15):
except subprocess.TimeoutExpired:
Utils.errorExit("Terminate call failed on node: %s" % (self.cmd))

# mark node as killed
self.pid=None
self.killed=True

def verifyAlive(self, silent=False):
if not silent and Utils.Debug: Utils.Print("Checking if node(pid=%s) is alive(killed=%s): %s" % (self.pid, self.killed, self.cmd))
if self.killed or self.pid is None:
Expand Down Expand Up @@ -1318,7 +1322,7 @@ def getNextCleanProductionCycle(self, trans):

# TBD: make nodeId an internal property
# pylint: disable=too-many-locals
def relaunch(self, nodeId, chainArg, newChain=False, timeout=Utils.systemWaitTimeout, addOrSwapFlags=None, cachePopen=False):
def relaunch(self, nodeId, chainArg=None, newChain=False, timeout=Utils.systemWaitTimeout, addOrSwapFlags=None, cachePopen=False):

assert(self.pid is None)
assert(self.killed)
Expand Down

0 comments on commit fcd01c8

Please sign in to comment.