From 3b48335a26e46d7935d2bbb86f31386949bb1ee2 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 3 Mar 2010 20:23:43 +0000 Subject: Extended cluster_tests.test_management exposes a bug. - kill and start brokers with clients running. - added qpid-stat -b and testagent clients - disabled in src/tests/cluster_tests.fail till bug is fixed. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@918674 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/qpid/brokertest.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'qpid/python') diff --git a/qpid/python/qpid/brokertest.py b/qpid/python/qpid/brokertest.py index 382f116ff6..d0ec6e0932 100644 --- a/qpid/python/qpid/brokertest.py +++ b/qpid/python/qpid/brokertest.py @@ -188,12 +188,7 @@ class Popen(popen2.Popen3): except: self.unexpected("expected running, exit code %d" % self.wait()) else: - # Give the process some time to exit. - # FIXME aconway 2010-03-02: use retry - delay = 0.1 - while (self.poll() is None and delay < 1): - time.sleep(delay) - delay *= 2 + retry(self.poll) if self.returncode is None: # Still haven't stopped self.kill() self.unexpected("still running") @@ -229,7 +224,6 @@ class Popen(popen2.Popen3): return self.returncode def send_signal(self, sig): - log.debug("kill -%s %s"%(sig, self.pname)) self.was_shutdown = True os.kill(self.pid,sig) self.wait() -- cgit v1.2.1