aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Masood Malekghassemi <atash@google.com>2016-06-28 13:58:42 -0700
committerGravatar Masood Malekghassemi <atash@google.com>2016-07-01 10:18:47 -0700
commite6a23e255bb01eb0006a627b261da67983a0c021 (patch)
tree71d75250d08c9cb0013a7df59cfa894484fb60bd
parent1c062bdd8cedccbfdd3474668e4c6f43af098e23 (diff)
Fix job_spec invocation for Python run_tests
-rwxr-xr-xtools/run_tests/run_tests.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index e9c663695b..8913e9ded3 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -396,15 +396,13 @@ class PythonLanguage(object):
environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS)
return [self.config.job_spec(
['tools/run_tests/run_python.sh', config.venv_python],
- None,
+ timeout_seconds=5*60,
environ=dict(environment.items() +
[('GRPC_PYTHON_TESTRUNNER_FILTER', suite_name)]),
- shortname='%s.test.%s' % (config.venv, suite_name),
- timeout_seconds=5*60)
+ shortname='%s.test.%s' % (config.venv, suite_name),)
for suite_name in tests_json
for config in self.pythons]
-
def pre_build_steps(self):
return []