commit 8f56c422f8c91292d4ab9e84919976ab58cf0e69
author Masood Malekghassemi <soltanmm@users.noreply.github.com> Tue Aug 25 10:23:19 2015 -0700
committer Masood Malekghassemi <soltanmm@users.noreply.github.com> Tue Aug 25 14:07:18 2015 -0700
tree 66e41d12f906cd02960ff1d3b7b698f4fcb9a750
parent 1f1919c8cfc61cd9af288cd1585b38b9c3511e1f

Add global per-test timeout to Python test harness

src/python/grpcio_test/setup.py

diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio_test/setup.py
index a6203ca..898ea20 100644
--- a/src/python/grpcio_test/setup.py
+++ b/src/python/grpcio_test/setup.py
@@ -61,6 +61,7 @@
     'pytest>=2.6',
     'pytest-cov>=2.0',
     'pytest-xdist>=1.11',
+    'pytest-timeout>=0.5',
 )
 
 _INSTALL_REQUIRES = (

tools/run_tests/run_python.sh

diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index 6fdca93..858f300 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -47,4 +47,4 @@
 "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"