Skip to content

Commit

Permalink
Removed django.test.simple and django.test._doctest per deprecation t…
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Mar 21, 2014
1 parent b71f183 commit bf5430a
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 3,162 deletions.
2,757 changes: 0 additions & 2,757 deletions django/test/_doctest.py

This file was deleted.

251 changes: 0 additions & 251 deletions django/test/simple.py

This file was deleted.

5 changes: 0 additions & 5 deletions docs/ref/settings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2067,11 +2067,6 @@ Default: ``'django.test.runner.DiscoverRunner'``
The name of the class to use for starting the test suite. See
:ref:`other-testing-frameworks`.

.. versionchanged:: 1.6

Previously the default ``TEST_RUNNER`` was
``django.test.simple.DjangoTestSuiteRunner``.

.. setting:: THOUSAND_SEPARATOR

THOUSAND_SEPARATOR
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ doc_files = docs extras AUTHORS INSTALL LICENSE README.rst
install-script = scripts/rpm-install.sh

[flake8]
exclude=build,.git,./django/utils/dictconfig.py,./django/utils/unittest.py,./django/utils/lru_cache.py,./tests/comment_tests/*,./django/test/_doctest.py,./django/utils/six.py,./django/conf/app_template/*,./django/dispatch/weakref_backports.py
exclude=build,.git,./django/utils/dictconfig.py,./django/utils/unittest.py,./django/utils/lru_cache.py,./django/utils/six.py,./django/conf/app_template/*,./django/dispatch/weakref_backports.py
ignore=E128,E501,W601

[metadata]
Expand Down
24 changes: 1 addition & 23 deletions tests/test_runner/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
from __future__ import unicode_literals

from optparse import make_option
import types
import unittest

from django.core.exceptions import ImproperlyConfigured
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
Expand Down Expand Up @@ -221,27 +220,6 @@ def test_ticket_17477(self):
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 = []
Expand Down
Empty file.
37 changes: 0 additions & 37 deletions tests/test_suite_override/tests.py

This file was deleted.

Loading

0 comments on commit bf5430a

Please sign in to comment.