innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Shortened some test model names that were introduced in r16366 to fix running tests on PostgreSQL. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-06-13 17:48:02 +00:00
parent bcad22655f
commit bead688a3b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/modeltests/validation/models.py
View File

@ -88,5 +88,5 @@ class GenericIPAddressTestModel(models.Model):
v4_ip = models.GenericIPAddressField(blank=True, protocol="ipv4") v4_ip = models.GenericIPAddressField(blank=True, protocol="ipv4")
v6_ip = models.GenericIPAddressField(blank=True, protocol="ipv6") v6_ip = models.GenericIPAddressField(blank=True, protocol="ipv6")
class GenericIPAddressWithUnpackUniqueTestModel(models.Model): class GenericIPAddrUnpackUniqueTest(models.Model):
generic_v4unpack_ip = models.GenericIPAddressField(blank=True, unique=True, unpack_ipv4=True) generic_v4unpack_ip = models.GenericIPAddressField(blank=True, unique=True, unpack_ipv4=True)

6
tests/modeltests/validation/tests.py
View File

@ -3,7 +3,7 @@ from django.test import TestCase
from django.core.exceptions import NON_FIELD_ERRORS from django.core.exceptions import NON_FIELD_ERRORS
from modeltests.validation import ValidationTestCase from modeltests.validation import ValidationTestCase
from modeltests.validation.models import (Author, Article, ModelToValidate, from modeltests.validation.models import (Author, Article, ModelToValidate,
GenericIPAddressTestModel, GenericIPAddressWithUnpackUniqueTestModel) GenericIPAddressTestModel, GenericIPAddrUnpackUniqueTest)
# Import other tests for this package. # Import other tests for this package.
from modeltests.validation.validators import TestModelsWithValidators from modeltests.validation.validators import TestModelsWithValidators
@ -177,7 +177,7 @@ class GenericIPAddressFieldTests(ValidationTestCase):
self.assertEqual(None, giptm.full_clean()) self.assertEqual(None, giptm.full_clean())
# These two are the same, because we are doing IPv4 unpacking # These two are the same, because we are doing IPv4 unpacking
giptm = GenericIPAddressWithUnpackUniqueTestModel(generic_v4unpack_ip="::ffff:18.52.18.52") giptm = GenericIPAddrUnpackUniqueTest(generic_v4unpack_ip="::ffff:18.52.18.52")
giptm.save() giptm.save()
giptm = GenericIPAddressWithUnpackUniqueTestModel(generic_v4unpack_ip="18.52.18.52") giptm = GenericIPAddrUnpackUniqueTest(generic_v4unpack_ip="18.52.18.52")
self.assertFailsValidation(giptm.full_clean, ['generic_v4unpack_ip',]) self.assertFailsValidation(giptm.full_clean, ['generic_v4unpack_ip',])