Upgrade gRPC to version 1.61.1. am: d0ea8b5e80

Original change: https://android-review.googlesource.com/c/platform/external/grpc-grpc/+/2972751

Change-Id: I0e12d02c8be49fdf7d73f148c15531b144eff74e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/python/grpcio_tests/tests/_loader.py b/src/python/grpcio_tests/tests/_loader.py
index 9db7e343ac..b9fc3ccf0f 100644
--- a/src/python/grpcio_tests/tests/_loader.py
+++ b/src/python/grpcio_tests/tests/_loader.py
@@ -15,6 +15,7 @@
 from __future__ import absolute_import
 
 import importlib
+import logging
 import os
 import pkgutil
 import re
@@ -23,6 +24,8 @@ import unittest
 
 import coverage
 
+logger = logging.getLogger(__name__)
+
 TEST_MODULE_REGEX = r"^.*_test$"
 
 
@@ -106,11 +109,15 @@ class Loader(object):
             module = None
             if module_name in sys.modules:
                 module = sys.modules[module_name]
+                self.visit_module(module)
             else:
-                spec = importer.find_spec(module_name)
-                module = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(module)
-            self.visit_module(module)
+                try:
+                    spec = importer.find_spec(module_name)
+                    module = importlib.util.module_from_spec(spec)
+                    spec.loader.exec_module(module)
+                    self.visit_module(module)
+                except ModuleNotFoundError:
+                    logger.debug("Skip loading %s", module_name)
 
     def visit_module(self, module):
         """Visits the module, adding discovered tests to the test suite.