Merge branch 'revert-24337-revert-24289-aio-import-dot' into patch-aio-import-dot-1-33

src/python/grpcio/grpc/__init__.py

@@ -2123,3 +2123,8 @@ try:
     sys.modules.update({'grpc.reflection': grpc_reflection})
 except ImportError:
     pass
+
+# Prevents import order issue in the case of renamed path.
+if sys.version_info >= (3, 6) and __name__ == "grpc.__init__":
+    from grpc import aio  # pylint: disable=ungrouped-imports
+    sys.modules.update({'grpc.aio': aio})

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.TestChannel",
+  "unit.init_test.TestInit",
   "unit.metadata_test.TestMetadata",
   "unit.outside_init_test.TestOutsideInit",
   "unit.secure_call_test.TestStreamStreamSecureCall",

src/python/grpcio_tests/tests_aio/unit/init_test.py

@@ -14,37 +14,20 @@
 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 TestChannel(AioTestBase):
-
-    async def test_insecure_channel(self):
-        server_target, _ = await start_test_server()  # pylint: disable=unused-variable
 
-        channel = aio.insecure_channel(server_target)
-        self.assertIsInstance(channel, aio.Channel)
+class TestInit(AioTestBase):
 
-    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)
+    async def test_grpc(self):
+        import grpc  # pylint: disable=wrong-import-position
+        channel = grpc.aio.insecure_channel('dummy')
+        self.assertIsInstance(channel, grpc.aio.Channel)
 
-        self.assertIsInstance(secure_channel, aio.Channel)
+    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)
 
 
 if __name__ == '__main__':