From 81cdf1e34e8501e3e0e50182dd6d13499b473868 Mon Sep 17 00:00:00 2001
From: Masood Malekghassemi <atash@google.com>
Date: Thu, 20 Oct 2016 14:42:31 -0700
Subject: [PATCH] Fix Python tests' module loading behavior

---
 src/python/grpcio_tests/tests/_loader.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/python/grpcio_tests/tests/_loader.py b/src/python/grpcio_tests/tests/_loader.py
index c2f097f6c61..621bedc7bb8 100644
--- a/src/python/grpcio_tests/tests/_loader.py
+++ b/src/python/grpcio_tests/tests/_loader.py
@@ -84,11 +84,9 @@ class Loader(object):
         along.
     """
     for importer, module_name, is_package in (
-        pkgutil.iter_modules(package_paths)):
+        pkgutil.walk_packages(package_paths)):
       module = importer.find_module(module_name).load_module(module_name)
       self.visit_module(module)
-      if is_package:
-        self.walk_packages(module.__path__)
 
   def visit_module(self, module):
     """Visits the module, adding discovered tests to the test suite.