summaryrefslogtreecommitdiff
path: root/tests/test_runner/tests.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-09-05 12:22:35 -0400
committerTim Graham <timograham@gmail.com>2015-09-23 19:31:11 -0400
commit48e7787db599b0103daf70f0ff4968d90b8540aa (patch)
tree4ea92c1b4a6b42adaccb54790adb8ef6886fa381 /tests/test_runner/tests.py
parent2ccfac1a651ff35cd243cd272b2202ae1ccd5740 (diff)
Removed RemovedInDjango110Warning.
Diffstat (limited to 'tests/test_runner/tests.py')
-rw-r--r--tests/test_runner/tests.py5
1 files changed, 3 insertions, 2 deletions
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']