aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Nathaniel Manista <nathaniel@google.com>2015-08-25 14:38:11 -0700
committerGravatar Nathaniel Manista <nathaniel@google.com>2015-08-25 14:38:11 -0700
commit1b481b64be43bd4c7655b25422344a17b2f198d9 (patch)
tree74fcd9c7aa2aa38b21859ed60023b82dfe38005c /tools
parent7e3c3b2e8fe93f4f3fa79da2297d14c7eb7a04d9 (diff)
parent8f56c422f8c91292d4ab9e84919976ab58cf0e69 (diff)
Merge pull request #3059 from soltanmm/timeout
Add per-test timeouts to Python test harness.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run_tests/run_python.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index 6fdca93fd5..858f300800 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -47,4 +47,4 @@ source "python"$PYVER"_virtual_environment"/bin/activate
"python"$PYVER -m grpc_test._core_over_links_base_interface_test
"python"$PYVER -m grpc_test.framework.core._base_interface_test
-"python"$PYVER $GRPCIO_TEST/setup.py test -a "-n8 --cov=grpc --junitxml=./report.xml"
+"python"$PYVER $GRPCIO_TEST/setup.py test -a "-n8 --cov=grpc --junitxml=./report.xml --timeout=300"