summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2016-02-19 23:00:25 +0000
committerGordon Sim <gsim@apache.org>2016-02-19 23:00:25 +0000
commitc8860c7351d96d6698b06c6d64e62ba5a0a8b00a (patch)
treebffbc26b0ccce8e84083f2281ce700fbb666015b
parenta411e1bb0ce518c244d4866c68fbe37ea99a3454 (diff)
downloadqpid-python-c8860c7351d96d6698b06c6d64e62ba5a0a8b00a.tar.gz
QPID-7076: Avoid error with qpid-cpp-benchmark with 0 senders. Patch from yuelongguang@letv.com
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1731309 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/cpp/src/tests/qpid-cpp-benchmark9
1 files changed, 6 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/qpid-cpp-benchmark b/qpid/cpp/src/tests/qpid-cpp-benchmark
index 2d5ec711fe..3a5419de5e 100755
--- a/qpid/cpp/src/tests/qpid-cpp-benchmark
+++ b/qpid/cpp/src/tests/qpid-cpp-benchmark
@@ -340,16 +340,19 @@ def main():
# First fill the queues, then drain them
start = time.time()
senders = start_senders()
- for p in senders: p.wait()
+ for p in senders:
+ if p: p.wait()
receivers = start_receivers()
- for p in receivers: p.wait()
+ for p in receivers:
+ if p: p.wait()
else:
# Run senders and receivers in parallel
receivers = start_receivers()
ready_receiver.wait(filter(None, receivers)) # Wait for receivers ready
start = time.time()
senders = start_senders()
- for p in senders + receivers: p.wait()
+ for p in senders + receivers:
+ if p: p.wait()
total_sent = opts.queues * opts.senders * opts.messages
total_tp = total_sent / (time.time()-start)