From 3d0dcd7f5af378d3ab6adb303b913e6c7b2e0ee5 Mon Sep 17 00:00:00 2001 From: Hasan Date: Sun, 17 Jan 2016 14:56:39 +0330 Subject: Refs #26022 -- Used context manager version of assertRaises in tests. --- tests/model_forms/tests.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests/model_forms') diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index 12401759bd..a1adeec445 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -177,7 +177,8 @@ class ModelFormBaseTest(TestCase): def test_no_model_class(self): class NoModelModelForm(forms.ModelForm): pass - self.assertRaises(ValueError, NoModelModelForm) + with self.assertRaises(ValueError): + NoModelModelForm() def test_empty_fields_to_fields_for_model(self): """ @@ -282,8 +283,8 @@ class ModelFormBaseTest(TestCase): self.fail('Declarative field raised FieldError incorrectly') def test_extra_field_modelform_factory(self): - self.assertRaises(FieldError, modelform_factory, - Person, fields=['no-field', 'name']) + with self.assertRaises(FieldError): + modelform_factory(Person, fields=['no-field', 'name']) def test_replace_field(self): class ReplaceField(forms.ModelForm): @@ -1836,7 +1837,8 @@ class FileAndImageFieldTests(TestCase): """ f = forms.FileField(required=True) self.assertEqual(f.clean(False, 'initial'), 'initial') - self.assertRaises(ValidationError, f.clean, False) + with self.assertRaises(ValidationError): + f.clean(False) def test_full_clear(self): """ @@ -2682,8 +2684,8 @@ class FormFieldCallbackTests(SimpleTestCase): def test_bad_callback(self): # A bad callback provided by user still gives an error - self.assertRaises(TypeError, modelform_factory, Person, fields="__all__", - formfield_callback='not a function or callable') + with self.assertRaises(TypeError): + modelform_factory(Person, fields="__all__", formfield_callback='not a function or callable') class LocalizedModelFormTest(TestCase): -- cgit v1.3