Ticket #17751: 17751-test.diff

tests/modeltests/validators/tests.py

@@ -54 +54 @@
     (validate_ipv4_address, '25.1.1.', ValidationError),
     (validate_ipv4_address, '25,1,1,1', ValidationError),
     (validate_ipv4_address, '25.1 .1.1', ValidationError),
+    (validate_ipv4_address, ' 1.1.1.1', ValidationError),
 
     # validate_ipv6_address uses django.utils.ipv6, which
     # is tested in much greater detail in it's own testcase
@@ -64 +65 @@
     (validate_ipv6_address, '1:2', ValidationError),
     (validate_ipv6_address, '::zzz', ValidationError),
     (validate_ipv6_address, '12345::', ValidationError),
+    (validate_ipv6_address, ' fe80::1', ValidationError),
 
     (validate_ipv46_address, '1.1.1.1', None),
     (validate_ipv46_address, '255.0.0.0', None),
@@ -159 +161 @@
     if expected is not None and issubclass(expected, Exception):
         test_mask = 'test_%s_raises_error_%d'
         def test_func(self):
-            self.assertRaises(expected, validator, value)
+            # Do not use assertRaises, so as to be able to produce a more
+            # precise error message
+            try:
+                validator(value)
+                raise AssertionError("%s not raised for value '%s'" % (
+                    expected.__name__, value))
+            except expected:
+                pass
     else:
         test_mask = 'test_%s_%d'
         def test_func(self):