diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py index 9675d62a87d..3566c382343 100644 --- a/src/python/grpcio/grpc/__init__.py +++ b/src/python/grpcio/grpc/__init__.py @@ -2123,7 +2123,3 @@ try: sys.modules.update({'grpc.reflection': grpc_reflection}) except ImportError: pass - -if sys.version_info >= (3, 6): - from grpc import aio # pylint: disable=ungrouped-imports - sys.modules.update({'grpc.aio': aio}) diff --git a/src/python/grpcio_tests/tests_aio/tests.json b/src/python/grpcio_tests/tests_aio/tests.json index 17ea7c8aa89..dbcdf304372 100644 --- a/src/python/grpcio_tests/tests_aio/tests.json +++ b/src/python/grpcio_tests/tests_aio/tests.json @@ -28,7 +28,7 @@ "unit.connectivity_test.TestConnectivityState", "unit.context_peer_test.TestContextPeer", "unit.done_callback_test.TestDoneCallback", - "unit.init_test.TestInit", + "unit.init_test.TestChannel", "unit.metadata_test.TestMetadata", "unit.outside_init_test.TestOutsideInit", "unit.secure_call_test.TestStreamStreamSecureCall", diff --git a/src/python/grpcio_tests/tests_aio/unit/init_test.py b/src/python/grpcio_tests/tests_aio/unit/init_test.py index a84b4a5c715..2582857751d 100644 --- a/src/python/grpcio_tests/tests_aio/unit/init_test.py +++ b/src/python/grpcio_tests/tests_aio/unit/init_test.py @@ -14,26 +14,38 @@ import logging import unittest +import grpc + +from grpc.experimental import aio +from tests_aio.unit._test_server import start_test_server from tests_aio.unit._test_base import AioTestBase +from tests.unit import resources + +_PRIVATE_KEY = resources.private_key() +_CERTIFICATE_CHAIN = resources.certificate_chain() +_TEST_ROOT_CERTIFICATES = resources.test_root_certificates() -class TestInit(AioTestBase): - async def test_grpc(self): - import grpc # pylint: disable=wrong-import-position - channel = grpc.aio.insecure_channel('dummy') - self.assertIsInstance(channel, grpc.aio.Channel) +class TestChannel(AioTestBase): - async def test_grpc_dot_aio(self): - import grpc.aio # pylint: disable=wrong-import-position - channel = grpc.aio.insecure_channel('dummy') - self.assertIsInstance(channel, grpc.aio.Channel) + async def test_insecure_channel(self): + server_target, _ = await start_test_server() # pylint: disable=unused-variable - async def test_aio_from_grpc(self): - from grpc import aio # pylint: disable=wrong-import-position - channel = aio.insecure_channel('dummy') + channel = aio.insecure_channel(server_target) self.assertIsInstance(channel, aio.Channel) + async def test_secure_channel(self): + server_target, _ = await start_test_server(secure=True) # pylint: disable=unused-variable + credentials = grpc.ssl_channel_credentials( + root_certificates=_TEST_ROOT_CERTIFICATES, + private_key=_PRIVATE_KEY, + certificate_chain=_CERTIFICATE_CHAIN, + ) + secure_channel = aio.secure_channel(server_target, credentials) + + self.assertIsInstance(secure_channel, aio.Channel) + if __name__ == '__main__': logging.basicConfig(level=logging.DEBUG)