aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/python
diff options
context:
space:
mode:
authorGravatar Masood Malekghassemi <soltanmm@users.noreply.github.com>2015-08-25 10:23:19 -0700
committerGravatar Masood Malekghassemi <soltanmm@users.noreply.github.com>2015-08-25 14:07:18 -0700
commit8f56c422f8c91292d4ab9e84919976ab58cf0e69 (patch)
tree66e41d12f906cd02960ff1d3b7b698f4fcb9a750 /src/python
parent1f1919c8cfc61cd9af288cd1585b38b9c3511e1f (diff)
Add global per-test timeout to Python test harness
Diffstat (limited to 'src/python')
-rw-r--r--src/python/grpcio_test/setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/grpcio_test/setup.py b/src/python/grpcio_test/setup.py
index a6203cae2d..898ea204ac 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 = (