Removed django.test.simple and django.test._doctest per deprecation timeline.

refs #17365, #17366, #18727.

5 files changed, 2 insertions, 148 deletions

diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py
index 20e7f6b892..8ec244cf8d 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -4,7 +4,6 @@ Tests for django test runner
 from __future__ import unicode_literals
 
 from optparse import make_option
-import types
 import unittest
 
 from django.core.exceptions import ImproperlyConfigured
@@ -12,7 +11,7 @@ from django.core.management import call_command
 from django import db
 from django.test import runner, TestCase, TransactionTestCase, skipUnlessDBFeature
 from django.test.testcases import connections_support_transactions
-from django.test.utils import IgnoreAllDeprecationWarningsMixin, override_system_checks
+from django.test.utils import override_system_checks
 from django.utils import six
 
 from admin_scripts.tests import AdminScriptTestCase
@@ -221,27 +220,6 @@ class Ticket17477RegressionTests(AdminScriptTestCase):
         self.assertNoOutput(err)
 
 
-class ModulesTestsPackages(IgnoreAllDeprecationWarningsMixin, unittest.TestCase):
-
-    def test_get_tests(self):
-        "Check that the get_tests helper function can find tests in a directory"
-        from django.apps import AppConfig
-        from django.test.simple import get_tests
-        app_config = AppConfig.create('test_runner.valid_app')
-        app_config.import_models({})
-        tests = get_tests(app_config)
-        self.assertIsInstance(tests, types.ModuleType)
-
-    def test_import_error(self):
-        "Test for #12658 - Tests with ImportError's shouldn't fail silently"
-        from django.apps import AppConfig
-        from django.test.simple import get_tests
-        app_config = AppConfig.create('test_runner_invalid_app')
-        app_config.import_models({})
-        with self.assertRaises(ImportError):
-            get_tests(app_config)
-
-
 class Sqlite3InMemoryTestDbs(TestCase):
 
     available_apps = []
diff --git a/tests/test_suite_override/__init__.py b/tests/test_suite_override/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/test_suite_override/__init__.py
+++ /dev/null
diff --git a/tests/test_suite_override/tests.py b/tests/test_suite_override/tests.py
deleted file mode 100644
index c485b801bc..0000000000
--- a/tests/test_suite_override/tests.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import unittest
-
-from django.apps import apps
-from django.test.utils import IgnoreAllDeprecationWarningsMixin
-
-
-def suite():
-    testSuite = unittest.TestSuite()
-    testSuite.addTest(SuiteOverrideTest('test_suite_override'))
-    return testSuite
-
-
-class SuiteOverrideTest(IgnoreAllDeprecationWarningsMixin, unittest.TestCase):
-
-    def test_suite_override(self):
-        """
-        Validate that you can define a custom suite when running tests with
-        ``django.test.simple.DjangoTestSuiteRunner`` (which builds up a test
-        suite using ``build_suite``).
-        """
-
-        from django.test.simple import build_suite
-        app_config = apps.get_app_config("test_suite_override")
-        suite = build_suite(app_config)
-        self.assertEqual(suite.countTestCases(), 1)
-
-
-class SampleTests(unittest.TestCase):
-    """These tests should not be discovered, due to the custom suite."""
-    def test_one(self):
-        pass
-
-    def test_two(self):
-        pass
-
-    def test_three(self):
-        pass
diff --git a/tests/test_utils/doctest_output.py b/tests/test_utils/doctest_output.py
deleted file mode 100644
index 0d1e94d037..0000000000
--- a/tests/test_utils/doctest_output.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from django.utils import six
-
-__test__ = {"API_TEST": r"""
-# Some checks of the doctest output normalizer.
-# Standard doctests do fairly
->>> import json
->>> from django.utils.xmlutils import SimplerXMLGenerator
->>> from django.utils.six import StringIO
-
->>> def produce_json():
-...     return json.dumps(['foo', {'bar': ('baz', None, 1.0, 2), 'whiz': 42}])
-
->>> def produce_xml():
-...     stream = StringIO()
-...     xml = SimplerXMLGenerator(stream, encoding='utf-8')
-...     xml.startDocument()
-...     xml.startElement("foo", {"aaa" : "1.0", "bbb": "2.0"})
-...     xml.startElement("bar", {"ccc" : "3.0"})
-...     xml.characters("Hello")
-...     xml.endElement("bar")
-...     xml.startElement("whiz", {})
-...     xml.characters("Goodbye")
-...     xml.endElement("whiz")
-...     xml.endElement("foo")
-...     xml.endDocument()
-...     return stream.getvalue()
-
->>> def produce_xml_fragment():
-...     stream = StringIO()
-...     xml = SimplerXMLGenerator(stream, encoding='utf-8')
-...     xml.startElement("foo", {"aaa": "1.0", "bbb": "2.0"})
-...     xml.characters("Hello")
-...     xml.endElement("foo")
-...     xml.startElement("bar", {"ccc": "3.0", "ddd": "4.0"})
-...     xml.endElement("bar")
-...     return stream.getvalue()
-
-# JSON output is normalized for field order, so it doesn't matter
-# which order json dictionary attributes are listed in output
->>> produce_json()
-'["foo", {"bar": ["baz", null, 1.0, 2], "whiz": 42}]'
-
->>> produce_json()
-'["foo", {"whiz": 42, "bar": ["baz", null, 1.0, 2]}]'
-
-# XML output is normalized for attribute order, so it doesn't matter
-# which order XML element attributes are listed in output
->>> produce_xml()
-'<?xml version="1.0" encoding="UTF-8"?>\n<foo aaa="1.0" bbb="2.0"><bar ccc="3.0">Hello</bar><whiz>Goodbye</whiz></foo>'
-
->>> produce_xml()
-'<?xml version="1.0" encoding="UTF-8"?>\n<foo bbb="2.0" aaa="1.0"><bar ccc="3.0">Hello</bar><whiz>Goodbye</whiz></foo>'
-
->>> produce_xml_fragment()
-'<foo aaa="1.0" bbb="2.0">Hello</foo><bar ccc="3.0" ddd="4.0"></bar>'
-
->>> produce_xml_fragment()
-'<foo bbb="2.0" aaa="1.0">Hello</foo><bar ddd="4.0" ccc="3.0"></bar>'
-
-"""}
-
-if six.PY2:
-    __test__["API_TEST"] += """
->>> def produce_long():
-...     return 42L
-
->>> def produce_int():
-...     return 42
-
-# Long values are normalized and are comparable to normal integers ...
->>> produce_long()
-42
-
-# ... and vice versa
->>> produce_int()
-42L
-"""
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
index 365341d50f..d3c7aec1f3 100644
--- a/tests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -11,8 +11,7 @@ from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.test import SimpleTestCase, TestCase, skipIfDBFeature, skipUnlessDBFeature
 from django.test.html import HTMLParseError, parse_html
-from django.test.utils import (CaptureQueriesContext,
-    IgnoreAllDeprecationWarningsMixin, override_settings)
+from django.test.utils import CaptureQueriesContext, override_settings
 from django.utils import six
 
 from .models import Person
@@ -623,15 +622,6 @@ class AssertFieldOutputTests(SimpleTestCase):
         self.assertFieldOutput(MyCustomField, {}, {}, empty_value=None)
 
 
-class DoctestNormalizerTest(IgnoreAllDeprecationWarningsMixin, SimpleTestCase):
-
-    def test_normalizer(self):
-        from django.test.simple import make_doctest
-        suite = make_doctest("test_utils.doctest_output")
-        failures = unittest.TextTestRunner(stream=six.StringIO()).run(suite)
-        self.assertEqual(failures.failures, [])
-
-
 # for OverrideSettingsTests
 def fake_view(request):
     pass