diff options
| author | Alan Conway <aconway@apache.org> | 2010-10-25 20:59:52 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-10-25 20:59:52 +0000 |
| commit | 20aeba57098bd0b55894bfdf00f4fc0d545188f0 (patch) | |
| tree | 03f063226a572413e38ba3740040c10e94c6fc87 | |
| parent | 29c9440e7b5bbddff09fd22cb6ba0df67504cdcf (diff) | |
| download | qpid-python-20aeba57098bd0b55894bfdf00f4fc0d545188f0.tar.gz | |
Fix bug in qpid-cpp-benchmark.
Symptom was exit with:
File "/home/remote/aconway/qpid/qpid/cpp/src/tests/qpid-cpp-benchmark", line 172, in wait
if (r.poll()): raise "Receiver error: %s"%(wait_for_output(r))
NameError: global name 'wait_for_output' is not defined
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1027266 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | cpp/src/tests/qpid-cpp-benchmark | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/tests/qpid-cpp-benchmark b/cpp/src/tests/qpid-cpp-benchmark index 99eb3b2f0b..1e0d75a49e 100755 --- a/cpp/src/tests/qpid-cpp-benchmark +++ b/cpp/src/tests/qpid-cpp-benchmark @@ -161,6 +161,7 @@ class ReadyReceiver: self.connection.open() self.receiver = self.connection.session().receiver( "%s;{create:always,delete:always}"%(queue)) + self.receiver.session.sync() self.timeout=2 def wait(self, receivers): @@ -169,7 +170,9 @@ class ReadyReceiver: self.connection.close() except qpid.messaging.Empty: for r in receivers: - if (r.poll()): raise "Receiver error: %s"%(wait_for_output(r)) + if (r.poll() is not None): + out,err=r.communicate() + raise "Receiver error: %s"%(out) raise "Timed out waiting for receivers to be ready" def flatten(l): return sum(map(lambda s: s.split(","), l),[]) @@ -197,7 +200,6 @@ def main(): ready_queue="%s-ready"%(opts.queue_name) queues = ["%s-%s"%(opts.queue_name, i) for i in xrange(opts.queues)] for i in xrange(opts.repeat): - delete_queues(queues, opts.broker[0]) ready_receiver = ReadyReceiver(ready_queue, opts.broker[0]) receivers = [start_receive(q, opts, ready_queue, brokers.next(), client_hosts.next()) |