Ticket #17499: 17499-2.diff

django/test/testcases.py

@@ -31 +31 @@
 from django.test.utils import (get_warnings_state, restore_warnings_state,
     override_settings)
 from django.utils import simplejson, unittest as ut2
-from django.utils.encoding import smart_str
+from django.utils.encoding import smart_str, force_unicode
 from django.views.static import serve
 
 __all__ = ('DocTestRunner', 'OutputChecker', 'TestCase', 'TransactionTestCase',
@@ -335 +335 @@
                 optional.clean(input)
             self.assertEqual(context_manager.exception.messages, errors)
         # test required inputs
-        error_required = [u'This field is required.']
+        error_required = [force_unicode(required.error_messages['required'])]
         for e in EMPTY_VALUES:
             with self.assertRaises(ValidationError) as context_manager:
                 required.clean(e)

tests/regressiontests/test_utils/tests.py

@@ -1 +1 @@
 from __future__ import with_statement, absolute_import
 
-from django.forms import EmailField
+from django.forms import EmailField, IntegerField
 from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
 from django.utils.unittest import skip
 
@@ -149 +149 @@
         self.assertRaises(AssertionError, self.assertFieldOutput, EmailField, {'a@a.com': 'Wrong output'}, {'aaa': error_invalid})
         self.assertRaises(AssertionError, self.assertFieldOutput, EmailField, {'a@a.com': 'a@a.com'}, {'aaa': [u'Come on, gimme some well formatted data, dude.']})
 
+    def test_custom_required_message(self):
+        class MyCustomField(IntegerField):
+            default_error_messages = {
+                'required': u'This is really required.',
+            }
+        self.assertFieldOutput(MyCustomField, {}, {}, empty_value=None)
 
 __test__ = {"API_TEST": r"""
 # Some checks of the doctest output normalizer.