diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-03 20:23:43 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-03 20:23:43 +0000 |
| commit | e855d055a9c136828dd45336e372cd2d8726b6e7 (patch) | |
| tree | fcf9355d10b6cb5a2f8e39626ef2e43bff31b5e6 /python | |
| parent | ddd5b1a3e0c37ef3f02c7ba4c948b1be94ff2d59 (diff) | |
| download | qpid-python-e855d055a9c136828dd45336e372cd2d8726b6e7.tar.gz | |
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/qpid@918674 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
| -rw-r--r-- | python/qpid/brokertest.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py index 382f116ff6..d0ec6e0932 100644 --- a/python/qpid/brokertest.py +++ b/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() |