From 704443acacf0dfbcb1c52df4b260585055754ce7 Mon Sep 17 00:00:00 2001 From: Morgan Aubert Date: Fri, 27 Apr 2018 17:18:15 -0400 Subject: Fixed #29363 -- Added SimpleTestCase.assertWarnsMessage(). --- tests/modeladmin/test_has_add_permission_obj_deprecation.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'tests/modeladmin') diff --git a/tests/modeladmin/test_has_add_permission_obj_deprecation.py b/tests/modeladmin/test_has_add_permission_obj_deprecation.py index 6d48f210d1..18448e94d7 100644 --- a/tests/modeladmin/test_has_add_permission_obj_deprecation.py +++ b/tests/modeladmin/test_has_add_permission_obj_deprecation.py @@ -1,5 +1,3 @@ -import warnings - from django.contrib.admin.options import ModelAdmin, TabularInline from django.utils.deprecation import RemovedInDjango30Warning @@ -52,12 +50,9 @@ class HasAddPermissionObjTests(CheckTestCase): class BandAdmin(ModelAdmin): inlines = [SongInlineAdmin] - with warnings.catch_warnings(record=True) as recorded: - warnings.simplefilter('always') - self.assertIsValid(BandAdmin, Band) - self.assertEqual(len(recorded), 1) - self.assertIs(recorded[0].category, RemovedInDjango30Warning) - self.assertEqual(str(recorded[0].message), ( + msg = ( "Update SongInlineAdmin.has_add_permission() to accept a " "positional `obj` argument." - )) + ) + with self.assertWarnsMessage(RemovedInDjango30Warning, msg): + self.assertIsValid(BandAdmin, Band) -- cgit v1.3