Remove gcov special-casing for Python tests

We'll need to fix coverage testing in the future anyway (see #6894).
pull/6791/head
Masood Malekghassemi 9 years ago
parent 0bd13ed8d0
commit 1c062bdd8c
  1. 4
      tools/run_tests/build_python.sh
  2. 27
      tools/run_tests/run_tests.py

@ -72,10 +72,6 @@ else
exit 1 exit 1
fi fi
if [ "$CONFIG" = "gcov" ]; then
export GRPC_PYTHON_ENABLE_CYTHON_TRACING=1
fi
# Instnatiate the virtualenv, preferring to do so from the relevant python # Instnatiate the virtualenv, preferring to do so from the relevant python
# version. Even if these commands fail (e.g. on Windows due to name conflicts) # version. Even if these commands fail (e.g. on Windows due to name conflicts)
# it's possible that the virtualenv is still usable and we trust the tester to # it's possible that the virtualenv is still usable and we trust the tester to

@ -394,24 +394,15 @@ class PythonLanguage(object):
with open('src/python/grpcio_tests/tests/tests.json') as tests_json_file: with open('src/python/grpcio_tests/tests/tests.json') as tests_json_file:
tests_json = json.load(tests_json_file) tests_json = json.load(tests_json_file)
environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS) environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS)
if self.config.build_config != 'gcov': return [self.config.job_spec(
return [self.config.job_spec( ['tools/run_tests/run_python.sh', config.venv_python],
['tools/run_tests/run_python.sh', config.venv_python], None,
None, environ=dict(environment.items() +
environ=dict(environment.items() + [('GRPC_PYTHON_TESTRUNNER_FILTER', suite_name)]),
[('GRPC_PYTHON_TESTRUNNER_FILTER', suite_name)]), shortname='%s.test.%s' % (config.venv, suite_name),
shortname='%s.test.%s' % (config.venv, suite_name), timeout_seconds=5*60)
timeout_seconds=5*60) for suite_name in tests_json
for suite_name in tests_json for config in self.pythons]
for config in self.pythons]
else:
return [self.config.job_spec(
['tools/run_tests/run_python.sh', config.venv_python],
None,
environ=environment,
shortname='%s.test.coverage' % config.venv,
timeout_seconds=15*60)
for config in self.pythons]
def pre_build_steps(self): def pre_build_steps(self):

Loading…
Cancel
Save