diff options
| author | Tim Graham <timograham@gmail.com> | 2013-05-28 15:11:41 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-05-28 15:12:47 -0400 |
| commit | ded95ccdce0ba983c405ddde9eb071e454245a94 (patch) | |
| tree | 1f0ebc0a4bb36b01b0e8a830acbe08964b278d73 /tests/validation | |
| parent | a2967d5204729771e3716c431ea98f8ee8562d3e (diff) | |
Fixed #20484 -- Added model validation for GenericIPAddressField
GenericIPAddressField must not allow blank for NOT NULL fields
Thanks Erik Romijn.
Diffstat (limited to 'tests/validation')
| -rw-r--r-- | tests/validation/models.py | 2 | ||||
| -rw-r--r-- | tests/validation/tests.py | 16 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tests/validation/models.py b/tests/validation/models.py index db083290fb..e95a1e0744 100644 --- a/tests/validation/models.py +++ b/tests/validation/models.py @@ -95,7 +95,7 @@ class GenericIPAddressTestModel(models.Model): blank=True, null=True) class GenericIPAddrUnpackUniqueTest(models.Model): - generic_v4unpack_ip = models.GenericIPAddressField(blank=True, unique=True, unpack_ipv4=True) + generic_v4unpack_ip = models.GenericIPAddressField(null=True, blank=True, unique=True, unpack_ipv4=True) # A model can't have multiple AutoFields diff --git a/tests/validation/tests.py b/tests/validation/tests.py index b571e0c298..9ddf796c2b 100644 --- a/tests/validation/tests.py +++ b/tests/validation/tests.py @@ -109,9 +109,9 @@ class GenericIPAddressFieldTests(ValidationTestCase): def test_correct_generic_ip_passes(self): giptm = GenericIPAddressTestModel(generic_ip="1.2.3.4") - self.assertEqual(None, giptm.full_clean()) + self.assertIsNone(giptm.full_clean()) giptm = GenericIPAddressTestModel(generic_ip="2001::2") - self.assertEqual(None, giptm.full_clean()) + self.assertIsNone(giptm.full_clean()) def test_invalid_generic_ip_raises_error(self): giptm = GenericIPAddressTestModel(generic_ip="294.4.2.1") @@ -121,7 +121,7 @@ class GenericIPAddressFieldTests(ValidationTestCase): def test_correct_v4_ip_passes(self): giptm = GenericIPAddressTestModel(v4_ip="1.2.3.4") - self.assertEqual(None, giptm.full_clean()) + self.assertIsNone(giptm.full_clean()) def test_invalid_v4_ip_raises_error(self): giptm = GenericIPAddressTestModel(v4_ip="294.4.2.1") @@ -131,7 +131,7 @@ class GenericIPAddressFieldTests(ValidationTestCase): def test_correct_v6_ip_passes(self): giptm = GenericIPAddressTestModel(v6_ip="2001::2") - self.assertEqual(None, giptm.full_clean()) + self.assertIsNone(giptm.full_clean()) def test_invalid_v6_ip_raises_error(self): giptm = GenericIPAddressTestModel(v6_ip="1.2.3.4") @@ -151,10 +151,16 @@ class GenericIPAddressFieldTests(ValidationTestCase): giptm = GenericIPAddressTestModel(generic_ip="::ffff:10.10.10.10") giptm.save() giptm = GenericIPAddressTestModel(generic_ip="10.10.10.10") - self.assertEqual(None, giptm.full_clean()) + self.assertIsNone(giptm.full_clean()) # These two are the same, because we are doing IPv4 unpacking giptm = GenericIPAddrUnpackUniqueTest(generic_v4unpack_ip="::ffff:18.52.18.52") giptm.save() giptm = GenericIPAddrUnpackUniqueTest(generic_v4unpack_ip="18.52.18.52") self.assertFailsValidation(giptm.full_clean, ['generic_v4unpack_ip',]) + + def test_empty_generic_ip_passes(self): + giptm = GenericIPAddressTestModel(generic_ip="") + self.assertIsNone(giptm.full_clean()) + giptm = GenericIPAddressTestModel(generic_ip=None) + self.assertIsNone(giptm.full_clean()) |