Ticket #12141: 12141.runtests_glob.diff

tests/runtests.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-import os, sys, traceback
+import os, sys, traceback, glob
 import unittest
 
 import django.contrib as contrib
@@ -85 +85 @@
         self.assert_(not unexpected, "Unexpected Errors: " + '\n'.join(unexpected))
         self.assert_(not missing, "Missing Errors: " + '\n'.join(missing))
 
+def collect_tests(*path):
+    pattern = os.path.join(*path)
+    labels = []
+    for path in glob.glob(pattern):
+        basename = os.path.basename(path)
+        if "." not in basename:
+            labels.append(basename)
+    return labels
+
 def django_tests(verbosity, interactive, test_labels):
     from django.conf import settings
 
+    tests_dir = os.path.dirname(__file__)
+
+    expanded_labels = []
+    for label in test_labels:
+        for pattern in label.split():
+            if "/" in label:
+                expanded_labels += collect_tests(tests_dir, pattern)
+            else:
+                expanded_labels += collect_tests(tests_dir, 'modeltests', pattern)
+                expanded_labels += collect_tests(tests_dir, 'regressiontests', pattern)
+    test_labels = expanded_labels
+    if test_labels:
+        print "Selected %s tests: %s" % (len(expanded_labels), ", ".join(expanded_labels))
+
     old_installed_apps = settings.INSTALLED_APPS
     old_test_database_name = settings.TEST_DATABASE_NAME
     old_root_urlconf = getattr(settings, "ROOT_URLCONF", "")
@@ -100 +123 @@
     # Redirect some settings for the duration of these tests.
     settings.INSTALLED_APPS = ALWAYS_INSTALLED_APPS
     settings.ROOT_URLCONF = 'urls'
-    settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), TEST_TEMPLATE_DIR),)
+    settings.TEMPLATE_DIRS = (os.path.join(tests_dir, TEST_TEMPLATE_DIR),)
     settings.USE_I18N = True
     settings.LANGUAGE_CODE = 'en'
     settings.LOGIN_URL = '/accounts/login/'