Remove gcov special-casing for Python tests

We'll need to fix coverage testing in the future anyway (see #6894).

2 files changed, 9 insertions, 22 deletions

diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh
index 1ad928f2da..687b04e954 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -72,10 +72,6 @@ else
   exit 1
 fi
 
-if [ "$CONFIG" = "gcov" ]; then
-  export GRPC_PYTHON_ENABLE_CYTHON_TRACING=1
-fi
-
 # 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)
 # it's possible that the virtualenv is still usable and we trust the tester to
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index fbc5729c75..e9c663695b 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -394,24 +394,15 @@ class PythonLanguage(object):
     with open('src/python/grpcio_tests/tests/tests.json') as tests_json_file:
       tests_json = json.load(tests_json_file)
     environment = dict(_FORCE_ENVIRON_FOR_WRAPPERS)
-    if self.config.build_config != 'gcov':
-      return [self.config.job_spec(
-          ['tools/run_tests/run_python.sh', config.venv_python],
-          None,
-          environ=dict(environment.items() +
-                       [('GRPC_PYTHON_TESTRUNNER_FILTER', suite_name)]),
-          shortname='%s.test.%s' % (config.venv, suite_name),
-          timeout_seconds=5*60)
-          for suite_name in tests_json
-          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]
+    return [self.config.job_spec(
+        ['tools/run_tests/run_python.sh', config.venv_python],
+        None,
+        environ=dict(environment.items() +
+                     [('GRPC_PYTHON_TESTRUNNER_FILTER', suite_name)]),
+        shortname='%s.test.%s' % (config.venv, suite_name),
+        timeout_seconds=5*60)
+        for suite_name in tests_json
+        for config in self.pythons]
 
 
   def pre_build_steps(self):