Ticket #10165: use_testrunner_setting_on_runtests.diff

django/core/management/commands/test.py

@@ -14 +14 @@
 
     def handle(self, *test_labels, **options):
         from django.conf import settings
+        from django.test.utils import get_runner
 
         verbosity = int(options.get('verbosity', 1))
         interactive = options.get('interactive', True)
-
-        test_path = settings.TEST_RUNNER.split('.')
-        # Allow for Python 2.5 relative paths
-        if len(test_path) > 1:
-            test_module_name = '.'.join(test_path[:-1])
-        else:
-            test_module_name = '.'
-        test_module = __import__(test_module_name, {}, {}, test_path[-1])
-        test_runner = getattr(test_module, test_path[-1])
+        test_runner = get_runner(settings)
 
         failures = test_runner(test_labels, verbosity=verbosity, interactive=interactive)
         if failures:

django/test/utils.py

@@ -65 +65 @@
 
     del mail.outbox
 
+
+def get_runner(settings):
+    test_path = settings.TEST_RUNNER.split('.')
+    # Allow for Python 2.5 relative paths
+    if len(test_path) > 1:
+        test_module_name = '.'.join(test_path[:-1])
+    else:
+        test_module_name = '.'
+    test_module = __import__(test_module_name, {}, {}, test_path[-1])
+    test_runner = getattr(test_module, test_path[-1])
+    return test_runner

tests/runtests.py

@@ -149 +149 @@
                 pass
 
     # Run the test suite, including the extra validation tests.
-    from django.test.simple import run_tests
-    failures = run_tests(test_labels, verbosity=verbosity, interactive=interactive, extra_tests=extra_tests)
-    if failures:
+    from django.test.utils import get_runner
+    if not hasattr(settings, 'TEST_RUNNER'):
+        settings.TEST_RUNNER = 'django.test.simple.run_tests'
+    test_runner = get_runner(settings)
+
+    failures = test_runner(test_labels, verbosity=verbosity, interactive=interactive, extra_tests=extra_tests)
+    if failures: 
         sys.exit(failures)
 
     # Restore the old settings.