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 | 22a5da985666df9ea6d614fb56fb28a8f4d794a3 (patch) | |
| tree | 6bd2e75c61cfc8d0c75863a52a66831d2bab3b93 /python | |
| parent | ce8b64f74c8f35868fd6b982be260f094f8889b7 (diff) | |
| download | qpid-python-22a5da985666df9ea6d614fb56fb28a8f4d794a3.tar.gz | |
Make management+cluster test more aggressive.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@957337 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
| -rw-r--r-- | python/qpid/brokertest.py | 5 |
1 files changed, 2 insertions, 3 deletions
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]) |