Refactor the way AsyncIO is tested under run_tests.py

src/python/grpcio_tests/tests/_runner.py

@@ -215,7 +215,7 @@ class Runner(object):
                         # re-raise the exception after forcing the with-block to end
                         raise
                     result.set_output(augmented_case.case, stdout_pipe.output(),
-                                    stderr_pipe.output())
+                                      stderr_pipe.output())
                     sys.stdout.write(result_out.getvalue())
                     sys.stdout.flush()
                     result_out.truncate(0)
@@ -233,4 +233,3 @@ class Runner(object):
         with open('report.xml', 'wb') as report_xml_file:
             _result.jenkins_junit_xml(result).write(report_xml_file)
         return result
-

tools/internal_ci/linux/pull_request/grpc_basictests_python_aio.cfg

@@ -1,30 +0,0 @@
-# Copyright 2019 The gRPC Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Config file for the internal CI (in protobuf text format)
-
-# Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_run_tests_matrix.sh"
-timeout_mins: 60
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-env_vars {
-  key: "RUN_TESTS_FLAGS"
-  value: "-f basictests linux python-aio --inner_jobs 16 -j 2 --internal_ci --max_time=3600"
-}

tools/internal_ci/macos/pull_request/grpc_basictests_python_aio.cfg

@@ -1,31 +0,0 @@
-# Copyright 2019 The gRPC Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Config file for the internal CI (in protobuf text format)
-
-# Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/macos/grpc_run_tests_matrix.sh"
-gfile_resources: "/bigstore/grpc-testing-secrets/gcp_credentials/GrpcTesting-d0eeee2db331.json"
-timeout_mins: 60
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-env_vars {
-  key: "RUN_TESTS_FLAGS"
-  value: "-f basictests macos python-aio --internal_ci -j 1 --inner_jobs 4 --max_time=3600"
-}

tools/internal_ci/windows/pull_request/grpc_basictests_python_aio.cfg

@@ -1,30 +0,0 @@
-# Copyright 2019 The gRPC Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Config file for the internal CI (in protobuf text format)
-
-# Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/windows/grpc_run_tests_matrix.bat"
-timeout_mins: 60
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.*"
-    regex: "github/grpc/reports/**"
-  }
-}
-
-env_vars {
-  key: "RUN_TESTS_FLAGS"
-  value: "-f basictests windows python-aio -j 1 --inner_jobs 8 --internal_ci --max_time=3600"
-}

tools/run_tests/run_tests.py

@@ -703,9 +703,16 @@ class PythonConfig(
 
 class PythonLanguage(object):
 
-    _DEFAULT_COMMAND = 'test_lite'
-    _TEST_SPECS_FILE = 'src/python/grpcio_tests/tests/tests.json'
-    _TEST_FOLDER = 'test'
+    _TEST_SPECS_FILE = {
+        'native': 'src/python/grpcio_tests/tests/tests.json',
+        'gevent': 'src/python/grpcio_tests/tests/tests.json',
+        'asyncio': 'src/python/grpcio_tests/tests_aio/tests.json',
+    }
+    _TEST_FOLDER = {
+        'native': 'test',
+        'gevent': 'test',
+        'asyncio': 'test_aio',
+    }
 
     def configure(self, config, args):
         self.config = config
@@ -793,9 +800,17 @@ class PythonLanguage(object):
             venv_relative_python = ['bin/python']
             toolchain = ['unix']
 
-        test_command = self._DEFAULT_COMMAND
-        if args.iomgr_platform == 'gevent':
+        # Selects the corresponding testing mode.
+        # See src/python/grpcio_tests/commands.py for implementation details.
+        if args.iomgr_platform == 'native':
+            test_command = 'test_lite'
+        elif args.iomgr_platform == 'gevent':
             test_command = 'test_gevent'
+        elif args.iomgr_platform == 'asyncio':
+            test_command = 'test_aio'
+        else:
+            raise ValueError(
+                'Unsupported IO Manager platform: %s' % args.iomgr_platform)
         runner = [
             os.path.abspath('tools/run_tests/helper_scripts/run_python.sh')
         ]

tools/run_tests/run_tests_matrix.py

@@ -231,7 +231,7 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
         languages=['python'],
         configs=['opt'],
         platforms=['linux', 'macos', 'windows'],
-        iomgr_platforms=['native', 'gevent'],
+        iomgr_platforms=['native', 'gevent', 'asyncio'],
         labels=['basictests', 'multilang'],
         extra_args=extra_args + ['--report_multi_target'],
         inner_jobs=inner_jobs)