test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignored warnings correctly in test_get_formsets_with_inlines_returns_tuples(). 

The subclass check in ModelAdmin.get_formsets_with_inlines() wasn't
tested correctly because of the super() call in
EpisodeAdmin.get_formsets().
This commit is contained in:
Berker Peksag 2014-12-30 02:25:51 +02:00 committed by Tim Graham
parent 013c2d8d02
commit 32ca159c96
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/options.py
View File

@ -773,7 +773,7 @@ class ModelAdmin(BaseModelAdmin):
warnings.warn( warnings.warn(
"ModelAdmin.get_formsets() is deprecated and will be removed in " "ModelAdmin.get_formsets() is deprecated and will be removed in "
"Django 1.9. Use ModelAdmin.get_formsets_with_inlines() instead.", "Django 1.9. Use ModelAdmin.get_formsets_with_inlines() instead.",
RemovedInDjango19Warning RemovedInDjango19Warning, stacklevel=2
) )
if formsets: if formsets:
zipped = zip(formsets, self.get_inline_instances(request, None)) zipped = zip(formsets, self.get_inline_instances(request, None))

17
tests/generic_inline_admin/tests.py
View File

@ -9,7 +9,7 @@ from django.contrib.contenttypes.admin import GenericTabularInline
from django.contrib.contenttypes.forms import generic_inlineformset_factory from django.contrib.contenttypes.forms import generic_inlineformset_factory
from django.forms.formsets import DEFAULT_MAX_NUM from django.forms.formsets import DEFAULT_MAX_NUM
from django.forms.models import ModelForm from django.forms.models import ModelForm
from django.test import TestCase, override_settings, RequestFactory from django.test import RequestFactory, TestCase, ignore_warnings, override_settings
from django.utils.deprecation import RemovedInDjango19Warning from django.utils.deprecation import RemovedInDjango19Warning
# local test models # local test models
@ -474,6 +474,7 @@ class GenericInlineModelAdminTest(TestCase):
list(ma.get_formsets_with_inlines(request)) list(ma.get_formsets_with_inlines(request))
self.assertEqual(len(w), 0) self.assertEqual(len(w), 0)
@ignore_warnings(category=RemovedInDjango19Warning)
def test_get_formsets_with_inlines_returns_tuples(self): def test_get_formsets_with_inlines_returns_tuples(self):
""" """
Ensure that get_formsets_with_inlines() returns the correct tuples. Ensure that get_formsets_with_inlines() returns the correct tuples.
@ -506,14 +507,12 @@ class GenericInlineModelAdminTest(TestCase):
] ]
def get_formsets(self, request, obj=None): def get_formsets(self, request, obj=None):
# Catch the deprecation warning to force the usage of get_formsets # Override get_formsets to force the usage of get_formsets in
with warnings.catch_warnings(record=True): # ModelAdmin.get_formsets_with_inlines() then ignore the
warnings.simplefilter("always") # warning raised by ModelAdmin.get_formsets_with_inlines()
return super(EpisodeAdmin, self).get_formsets(request, obj) return self._get_formsets(request, obj)
ma = EpisodeAdmin(Episode, self.site) ma = EpisodeAdmin(Episode, self.site)
inlines = ma.get_inline_instances(request) inlines = ma.get_inline_instances(request)
with warnings.catch_warnings(record=True): for (formset, inline), other_inline in zip(ma.get_formsets_with_inlines(request), inlines):
warnings.simplefilter("always") self.assertIsInstance(formset, other_inline.get_formset(request).__class__)
for (formset, inline), other_inline in zip(ma.get_formsets_with_inlines(request), inlines):
self.assertIsInstance(formset, other_inline.get_formset(request).__class__)