aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python/grpcio
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-05-06 15:31:22 -0700
committerGravatar Jan Tattermusch <jtattermusch@users.noreply.github.com>2016-05-06 15:31:22 -0700
commit3a4b903bf0554051d4a6523d3d252773c1c80495 (patch)
tree696c23f2c4a476af1ce86a720b868681d7d83a9a /src/python/grpcio
parentc916c1ce17fe273dff881e1c87e17ad991c2078a (diff)
parente6d03b828da478a7b4205c422bd95aa21f8270d4 (diff)
Merge pull request #6419 from sreecha/python_stress_test_docker
Python stress test docker config files and related changes
Diffstat (limited to 'src/python/grpcio')
-rw-r--r--src/python/grpcio/tests/stress/client.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/python/grpcio/tests/stress/client.py b/src/python/grpcio/tests/stress/client.py
index a733741b73..e2e016760c 100644
--- a/src/python/grpcio/tests/stress/client.py
+++ b/src/python/grpcio/tests/stress/client.py
@@ -117,7 +117,10 @@ def run_test(args):
for runner in runners:
runner.start()
try:
- raise exception_queue.get(block=True, timeout=args.test_duration_secs)
+ timeout_secs = args.test_duration_secs
+ if timeout_secs < 0:
+ timeout_secs = None
+ raise exception_queue.get(block=True, timeout=timeout_secs)
except Queue.Empty:
# No exceptions thrown, success
pass