diff options
| author | Alan Conway <aconway@apache.org> | 2010-06-23 20:56:30 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-06-23 20:56:30 +0000 |
| commit | 8cbe42bcbe46c8de6b799a05afd7da56461690c6 (patch) | |
| tree | 96795a28706314f2179bc2ec3325c8e40687df49 /qpid/python | |
| parent | 0cf66577e48ef18329c7cd64d3f690abe4019102 (diff) | |
| download | qpid-python-8cbe42bcbe46c8de6b799a05afd7da56461690c6.tar.gz | |
Make management+cluster test more aggressive.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@957337 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid/brokertest.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qpid/python/qpid/brokertest.py b/qpid/python/qpid/brokertest.py index 6825db3c56..011254d21d 100644 --- a/qpid/python/qpid/brokertest.py +++ b/qpid/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]) |