From 22a5da985666df9ea6d614fb56fb28a8f4d794a3 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 23 Jun 2010 20:56:30 +0000 Subject: Make management+cluster test more aggressive. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@957337 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/brokertest.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'python') diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py index 6825db3c56..011254d21d 100644 --- a/python/qpid/brokertest.py +++ b/python/qpid/brokertest.py @@ -240,10 +240,9 @@ class Popen(popen2.Popen3): def send_signal(self, sig): try: os.kill(self.pid,sig) except OSError,e: raise OSError("Kill failed %s: %s"%(self.pname, e)) - self._cleanup() - def terminate(self): self.send_signal(signal.SIGTERM) - def kill(self): self.send_signal(signal.SIGKILL) + def terminate(self): self.send_signal(signal.SIGTERM); self._cleanup() + def kill(self): self.send_signal(signal.SIGKILL); self._cleanup() def cmd_str(self): return " ".join([str(s) for s in self.cmd]) -- cgit v1.2.1