From 48e7787db599b0103daf70f0ff4968d90b8540aa Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 5 Sep 2015 12:22:35 -0400 Subject: Removed RemovedInDjango110Warning. --- tests/test_runner/tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/test_runner') 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'] -- cgit v1.3