diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio_test/setup.py index a6203cae2da26e4dbf266fec2edf30bd5f409487..898ea204acf0140aaf151df6ade4a4076c520637 100644 --- a/src/python/grpcio_test/setup.py +++ b/src/python/grpcio_test/setup.py @@ -61,6 +61,7 @@ _SETUP_REQUIRES = ( 'pytest>=2.6', 'pytest-cov>=2.0', 'pytest-xdist>=1.11', + 'pytest-timeout>=0.5', ) _INSTALL_REQUIRES = ( diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh index 6fdca93fd5ffe86a2803766de092b3752f7837e1..858f30080098ccdefea53056063fee571579c190 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"