diff options
| -rw-r--r-- | django/test/simple.py | 13 | ||||
| -rw-r--r-- | tests/regressiontests/test_runner/tests.py | 29 |
2 files changed, 1 insertions, 41 deletions
diff --git a/django/test/simple.py b/django/test/simple.py index 0c6a21bb37..de8b527f19 100644 --- a/django/test/simple.py +++ b/django/test/simple.py @@ -10,7 +10,7 @@ from django.utils import unittest from django.utils.importlib import import_module from django.utils.module_loading import module_has_submodule -__all__ = ('DjangoTestRunner', 'DjangoTestSuiteRunner') +__all__ = ('DjangoTestSuiteRunner') # The module name for tests outside models.py TEST_MODULE = 'tests' @@ -18,17 +18,6 @@ TEST_MODULE = 'tests' doctestOutputChecker = OutputChecker() -class DjangoTestRunner(unittest.TextTestRunner): - def __init__(self, *args, **kwargs): - import warnings - warnings.warn( - "DjangoTestRunner is deprecated; it's functionality is " - "indistinguishable from TextTestRunner", - DeprecationWarning - ) - super(DjangoTestRunner, self).__init__(*args, **kwargs) - - def get_tests(app_module): parts = app_module.__name__.split('.') prefix, last = parts[:-1], parts[-1] diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py index 22e9fe6af5..22baf0afdc 100644 --- a/tests/regressiontests/test_runner/tests.py +++ b/tests/regressiontests/test_runner/tests.py @@ -24,35 +24,6 @@ TEST_APP_OK = 'regressiontests.test_runner.valid_app.models' TEST_APP_ERROR = 'regressiontests.test_runner.invalid_app.models' -class DjangoTestRunnerTests(unittest.TestCase): - def setUp(self): - self._warnings_state = get_warnings_state() - warnings.filterwarnings('ignore', category=DeprecationWarning, - module='django.test.simple') - - def tearDown(self): - restore_warnings_state(self._warnings_state) - - def test_failfast(self): - class MockTestOne(unittest.TestCase): - def runTest(self): - assert False - class MockTestTwo(unittest.TestCase): - def runTest(self): - assert False - - suite = unittest.TestSuite([MockTestOne(), MockTestTwo()]) - mock_stream = StringIO.StringIO() - dtr = simple.DjangoTestRunner(verbosity=0, failfast=False, stream=mock_stream) - result = dtr.run(suite) - self.assertEqual(2, result.testsRun) - self.assertEqual(2, len(result.failures)) - - dtr = simple.DjangoTestRunner(verbosity=0, failfast=True, stream=mock_stream) - result = dtr.run(suite) - self.assertEqual(1, result.testsRun) - self.assertEqual(1, len(result.failures)) - class DependencyOrderingTests(unittest.TestCase): def test_simple_dependencies(self): |