diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/runtests.py | 5 | ||||
| -rw-r--r-- | tests/test_runner/tests.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/runtests.py b/tests/runtests.py index 0726fbb51d..955f96df7f 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -19,12 +19,9 @@ from django.test.runner import default_test_processes from django.test.utils import get_runner from django.utils import six from django.utils._os import upath -from django.utils.deprecation import ( - RemovedInDjango20Warning, RemovedInDjango110Warning, -) +from django.utils.deprecation import RemovedInDjango20Warning from django.utils.log import DEFAULT_LOGGING -warnings.simplefilter("error", RemovedInDjango110Warning) warnings.simplefilter("error", RemovedInDjango20Warning) RUNTESTS_DIR = os.path.abspath(os.path.dirname(upath(__file__))) diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index bf0b8795cc..b363514b2c 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -352,8 +352,9 @@ class DeprecationDisplayTest(AdminScriptTestCase): args = ['test', '--settings=test_project.settings', 'test_runner_deprecation_app'] out, err = self.run_django_admin(args) self.assertIn("Ran 1 test", force_text(err)) - six.assertRegex(self, err, r"RemovedInDjango\d+Warning: warning from test") - six.assertRegex(self, err, r"RemovedInDjango\d+Warning: module-level warning from deprecation_app") + # change "Deprecation" to "RemovedInDjango\d+" in Django 1.11. + six.assertRegex(self, err, r"DeprecationWarning: warning from test") + six.assertRegex(self, err, r"DeprecationWarning: module-level warning from deprecation_app") def test_runner_deprecation_verbosity_zero(self): args = ['test', '--settings=test_project.settings', '--verbosity=0', 'test_runner_deprecation_app'] |