[1.7.x] Fixed #22102 -- Made SimpleTestCase tests run before unittest.TestCase ones

Thanks aptiko for the report and Tim Graham for the review.
Backport of 3e3a7372f5 from master.

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/test_discovery_sample/tests_sample.py b/tests/test_discovery_sample/tests_sample.py
index d538771b0f..eb977e44fb 100644
--- a/tests/test_discovery_sample/tests_sample.py
+++ b/tests/test_discovery_sample/tests_sample.py
@@ -1,6 +1,9 @@
+import doctest
 from unittest import TestCase
 
-from django.test import TestCase as DjangoTestCase
+from django.test import SimpleTestCase, TestCase as DjangoTestCase
+
+from . import doctests
 
 
 class TestVanillaUnittest(TestCase):
@@ -15,5 +18,17 @@ class TestDjangoTestCase(DjangoTestCase):
         self.assertEqual(1, 1)
 
 
+class TestZimpleTestCase(SimpleTestCase):
+    # Z is used to trick this test case to appear after Vanilla in default suite
+
+    def test_sample(self):
+        self.assertEqual(1, 1)
+
+
 class EmptyTestCase(TestCase):
     pass
+
+
+def load_tests(loader, tests, ignore):
+    tests.addTests(doctest.DocTestSuite(doctests))
+    return tests