Reorganized test_runner test apps.

14 files changed, 38 insertions, 36 deletions

diff --git a/tests/runtests.py b/tests/runtests.py
index ae2d693ac2..350604fd06 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -44,8 +44,7 @@ atexit.register(shutil.rmtree, TMPDIR)
 SUBDIRS_TO_SKIP = [
     'data',
     'import_error_package',
-    'test_discovery_sample',
-    'test_discovery_sample2',
+    'test_runner_apps',
 ]
 
 ALWAYS_INSTALLED_APPS = [
diff --git a/tests/test_runner/test_discover_runner.py b/tests/test_runner/test_discover_runner.py
index 3908f0a9da..d897344d16 100644
--- a/tests/test_runner/test_discover_runner.py
+++ b/tests/test_runner/test_discover_runner.py
@@ -36,28 +36,28 @@ class DiscoverRunnerTest(TestCase):
 
     def test_dotted_test_module(self):
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.tests_sample"],
+            ['test_runner_apps.sample.tests_sample'],
         ).countTestCases()
 
-        self.assertEqual(count, 6)
+        self.assertEqual(count, 4)
 
     def test_dotted_test_class_vanilla_unittest(self):
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.tests_sample.TestVanillaUnittest"],
+            ['test_runner_apps.sample.tests_sample.TestVanillaUnittest'],
         ).countTestCases()
 
         self.assertEqual(count, 1)
 
     def test_dotted_test_class_django_testcase(self):
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.tests_sample.TestDjangoTestCase"],
+            ['test_runner_apps.sample.tests_sample.TestDjangoTestCase'],
         ).countTestCases()
 
         self.assertEqual(count, 1)
 
     def test_dotted_test_method_django_testcase(self):
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.tests_sample.TestDjangoTestCase.test_sample"],
+            ['test_runner_apps.sample.tests_sample.TestDjangoTestCase.test_sample'],
         ).countTestCases()
 
         self.assertEqual(count, 1)
@@ -65,17 +65,17 @@ class DiscoverRunnerTest(TestCase):
     def test_pattern(self):
         count = DiscoverRunner(
             pattern="*_tests.py",
-        ).build_suite(["test_discovery_sample"]).countTestCases()
+        ).build_suite(['test_runner_apps.sample']).countTestCases()
 
         self.assertEqual(count, 1)
 
     def test_file_path(self):
         with change_cwd(".."):
             count = DiscoverRunner().build_suite(
-                ["test_discovery_sample/"],
+                ['test_runner_apps/sample/'],
             ).countTestCases()
 
-        self.assertEqual(count, 7)
+        self.assertEqual(count, 5)
 
     def test_empty_label(self):
         """
@@ -91,14 +91,14 @@ class DiscoverRunnerTest(TestCase):
 
     def test_empty_test_case(self):
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.tests_sample.EmptyTestCase"],
+            ['test_runner_apps.sample.tests_sample.EmptyTestCase'],
         ).countTestCases()
 
         self.assertEqual(count, 0)
 
     def test_discovery_on_package(self):
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.tests"],
+            ['test_runner_apps.sample.tests'],
         ).countTestCases()
 
         self.assertEqual(count, 1)
@@ -112,14 +112,14 @@ class DiscoverRunnerTest(TestCase):
         should not. The discover runner avoids this behavior.
         """
         count = DiscoverRunner().build_suite(
-            ["test_discovery_sample.empty"],
+            ['test_runner_apps.sample.empty'],
         ).countTestCases()
 
         self.assertEqual(count, 0)
 
     def test_testcase_ordering(self):
         with change_cwd(".."):
-            suite = DiscoverRunner().build_suite(["test_discovery_sample/"])
+            suite = DiscoverRunner().build_suite(['test_runner_apps/sample/'])
             self.assertEqual(
                 suite._tests[0].__class__.__name__,
                 'TestDjangoTestCase',
@@ -149,10 +149,10 @@ class DiscoverRunnerTest(TestCase):
         """
         runner = DiscoverRunner(reverse=True)
         suite = runner.build_suite(
-            test_labels=('test_discovery_sample', 'test_discovery_sample2'))
-        self.assertIn('test_discovery_sample2', next(iter(suite)).id(),
+            test_labels=('test_runner_apps.sample', 'test_runner_apps.simple'))
+        self.assertIn('test_runner_apps.simple', next(iter(suite)).id(),
                       msg="Test labels should be reversed.")
-        suite = runner.build_suite(test_labels=('test_discovery_sample2',))
+        suite = runner.build_suite(test_labels=('test_runner_apps.simple',))
         suite = tuple(suite)
         self.assertIn('DjangoCase', suite[0].id(),
                       msg="Test groups should not be reversed.")
@@ -185,16 +185,16 @@ class DiscoverRunnerTest(TestCase):
 
     def test_tags(self):
         runner = DiscoverRunner(tags=['core'])
-        self.assertEqual(runner.build_suite(['test_discovery_sample.tests_sample']).countTestCases(), 1)
+        self.assertEqual(runner.build_suite(['test_runner_apps.tagged.tests']).countTestCases(), 1)
         runner = DiscoverRunner(tags=['fast'])
-        self.assertEqual(runner.build_suite(['test_discovery_sample.tests_sample']).countTestCases(), 2)
+        self.assertEqual(runner.build_suite(['test_runner_apps.tagged.tests']).countTestCases(), 2)
         runner = DiscoverRunner(tags=['slow'])
-        self.assertEqual(runner.build_suite(['test_discovery_sample.tests_sample']).countTestCases(), 2)
+        self.assertEqual(runner.build_suite(['test_runner_apps.tagged.tests']).countTestCases(), 2)
 
     def test_exclude_tags(self):
         runner = DiscoverRunner(tags=['fast'], exclude_tags=['core'])
-        self.assertEqual(runner.build_suite(['test_discovery_sample.tests_sample']).countTestCases(), 1)
+        self.assertEqual(runner.build_suite(['test_runner_apps.tagged.tests']).countTestCases(), 1)
         runner = DiscoverRunner(tags=['fast'], exclude_tags=['slow'])
-        self.assertEqual(runner.build_suite(['test_discovery_sample.tests_sample']).countTestCases(), 0)
+        self.assertEqual(runner.build_suite(['test_runner_apps.tagged.tests']).countTestCases(), 0)
         runner = DiscoverRunner(exclude_tags=['slow'])
-        self.assertEqual(runner.build_suite(['test_discovery_sample.tests_sample']).countTestCases(), 4)
+        self.assertEqual(runner.build_suite(['test_runner_apps.tagged.tests']).countTestCases(), 0)
diff --git a/tests/test_discovery_sample/__init__.py b/tests/test_runner_apps/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/test_discovery_sample/__init__.py
+++ b/tests/test_runner_apps/__init__.py
diff --git a/tests/test_discovery_sample/tests/__init__.py b/tests/test_runner_apps/sample/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/test_discovery_sample/tests/__init__.py
+++ b/tests/test_runner_apps/sample/__init__.py
diff --git a/tests/test_discovery_sample/doctests.py b/tests/test_runner_apps/sample/doctests.py
index 6d9403442c..6d9403442c 100644
--- a/tests/test_discovery_sample/doctests.py
+++ b/tests/test_runner_apps/sample/doctests.py
diff --git a/tests/test_discovery_sample/empty.py b/tests/test_runner_apps/sample/empty.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/test_discovery_sample/empty.py
+++ b/tests/test_runner_apps/sample/empty.py
diff --git a/tests/test_discovery_sample/pattern_tests.py b/tests/test_runner_apps/sample/pattern_tests.py
index f62a233d75..f62a233d75 100644
--- a/tests/test_discovery_sample/pattern_tests.py
+++ b/tests/test_runner_apps/sample/pattern_tests.py
diff --git a/tests/test_discovery_sample2/__init__.py b/tests/test_runner_apps/sample/tests/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/tests/test_discovery_sample2/__init__.py
+++ b/tests/test_runner_apps/sample/tests/__init__.py
diff --git a/tests/test_discovery_sample/tests/tests.py b/tests/test_runner_apps/sample/tests/tests.py
index 58bd4e7f1e..58bd4e7f1e 100644
--- a/tests/test_discovery_sample/tests/tests.py
+++ b/tests/test_runner_apps/sample/tests/tests.py
diff --git a/tests/test_discovery_sample/tests_sample.py b/tests/test_runner_apps/sample/tests_sample.py
index 694b01ffd4..eb977e44fb 100644
--- a/tests/test_discovery_sample/tests_sample.py
+++ b/tests/test_runner_apps/sample/tests_sample.py
@@ -1,7 +1,7 @@
 import doctest
 from unittest import TestCase
 
-from django.test import SimpleTestCase, TestCase as DjangoTestCase, tag
+from django.test import SimpleTestCase, TestCase as DjangoTestCase
 
 from . import doctests
 
@@ -29,18 +29,6 @@ class EmptyTestCase(TestCase):
     pass
 
 
-@tag('slow')
-class TaggedTestCase(TestCase):
-
-    @tag('fast')
-    def test_single_tag(self):
-        self.assertEqual(1, 1)
-
-    @tag('fast', 'core')
-    def test_multiple_tags(self):
-        self.assertEqual(1, 1)
-
-
 def load_tests(loader, tests, ignore):
     tests.addTests(doctest.DocTestSuite(doctests))
     return tests
diff --git a/tests/test_runner_apps/simple/__init__.py b/tests/test_runner_apps/simple/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/test_runner_apps/simple/__init__.py
diff --git a/tests/test_discovery_sample2/tests.py b/tests/test_runner_apps/simple/tests.py
index ac3e9daba0..ac3e9daba0 100644
--- a/tests/test_discovery_sample2/tests.py
+++ b/tests/test_runner_apps/simple/tests.py
diff --git a/tests/test_runner_apps/tagged/__init__.py b/tests/test_runner_apps/tagged/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/test_runner_apps/tagged/__init__.py
diff --git a/tests/test_runner_apps/tagged/tests.py b/tests/test_runner_apps/tagged/tests.py
new file mode 100644
index 0000000000..d3742b3749
--- /dev/null
+++ b/tests/test_runner_apps/tagged/tests.py
@@ -0,0 +1,15 @@
+from unittest import TestCase
+
+from django.test import tag
+
+
+@tag('slow')
+class TaggedTestCase(TestCase):
+
+    @tag('fast')
+    def test_single_tag(self):
+        self.assertEqual(1, 1)
+
+    @tag('fast', 'core')
+    def test_multiple_tags(self):
+        self.assertEqual(1, 1)