Added support for collecting tests only from specific packages.

diff --git a/Lib/lib-tk/test/runtktests.py b/Lib/lib-tk/test/runtktests.py
index b72badff5b7dc9e3ecba6df3a91d05664fbc656e..6c974cff5a83f4b0f944b710e5f01bdada83287a 100644 (file)
--- a/Lib/lib-tk/test/runtktests.py
+++ b/Lib/lib-tk/test/runtktests.py
@@ -19,9 +19,13 @@ def is_package(path):
             return True
     return False
 
-def get_tests_modules(basepath=this_dir_path, gui=True):
+def get_tests_modules(basepath=this_dir_path, gui=True, packages=None):
     """This will import and yield modules whose names start with test_
-    and are inside packages found in the path starting at basepath."""
+    and are inside packages found in the path starting at basepath.
+
+    If packages is specified it should contain package names that want
+    their tests colleted.
+    """
     py_ext = '.py'
 
     for dirpath, dirnames, filenames in os.walk(basepath):
@@ -31,6 +35,9 @@ def get_tests_modules(basepath=this_dir_path, gui=True):
 
         if is_package(dirpath) and filenames:
             pkg_name = dirpath[len(basepath) + len(os.sep):].replace('/', '.')
+            if packages and pkg_name not in packages:
+                continue
+
             filenames = filter(
                     lambda x: x.startswith('test_') and x.endswith(py_ext),
                     filenames)
@@ -45,7 +52,7 @@ def get_tests_modules(basepath=this_dir_path, gui=True):
                     if gui:
                         raise
 
-def get_tests(text=True, gui=True):
+def get_tests(text=True, gui=True, packages=None):
     """Yield all the tests in the modules found by get_tests_modules.
 
     If nogui is True, only tests that do not require a GUI will be
@@ -55,7 +62,7 @@ def get_tests(text=True, gui=True):
         attrs.append('tests_nogui')
     if gui:
         attrs.append('tests_gui')
-    for module in get_tests_modules(gui=gui):
+    for module in get_tests_modules(gui=gui, packages=packages):
         for attr in attrs:
             for test in getattr(module, attr, ()):
                 yield test