Ticket #6143: test-simple-refactor.diff

python/django/test/simple.py

@@ -35 +35 @@
                 mod[0].close()
             raise
     return test_module
-    
+
+def build_doctest_suite(module):
+    return doctest.DocTestSuite(module,
+                                checker=doctestOutputChecker,
+                                runner=DocTestRunner)
+
 def build_suite(app_module):
     "Create a complete Django test suite for the provided application module"
     suite = unittest.TestSuite()
@@ -47 +52 @@
     else:
         suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(app_module))
         try:
-            suite.addTest(doctest.DocTestSuite(app_module,
-                                               checker=doctestOutputChecker,
-                                               runner=DocTestRunner))
+            suite.addTest(build_doctest_suite(app_module))
         except ValueError:
             # No doc tests in models.py
             pass
@@ -64 +67 @@
             suite.addTest(test_module.suite())
         else:
             suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_module))
-            try:            
-                suite.addTest(doctest.DocTestSuite(test_module, 
-                                                   checker=doctestOutputChecker,
-                                                   runner=DocTestRunner))
+            try:
+                suite.addTest(build_doctest_suite(test_module))
             except ValueError:
                 # No doc tests in tests.py
                 pass
@@ -146 +147 @@
     teardown_test_environment()
     
     return len(result.failures) + len(result.errors)
-    
- No newline at end of file
+