From 899d484afb5653a171058e7683de6ea07b293462 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Thu, 7 May 2009 18:11:43 +0000 Subject: [PATCH] [1.0.X] Make sure that all uses of max_length in the test suite use values smaller than 255. If we use max_length > 255 the test suite can't be run on MySQL 4. Backport of [10697] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10698 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/forms/models.py | 2 +- tests/regressiontests/max_lengths/models.py | 8 ++++---- tests/regressiontests/max_lengths/tests.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/regressiontests/forms/models.py b/tests/regressiontests/forms/models.py index 42498cd4f9..cc066fc03d 100644 --- a/tests/regressiontests/forms/models.py +++ b/tests/regressiontests/forms/models.py @@ -10,7 +10,7 @@ class BoundaryModel(models.Model): positive_integer = models.PositiveIntegerField(null=True, blank=True) class Defaults(models.Model): - name = models.CharField(max_length=256, default='class default value') + name = models.CharField(max_length=255, default='class default value') def_date = models.DateField(default = datetime.date(1980, 1, 1)) value = models.IntegerField(default=42) diff --git a/tests/regressiontests/max_lengths/models.py b/tests/regressiontests/max_lengths/models.py index b4c43a220d..78eb30c49f 100644 --- a/tests/regressiontests/max_lengths/models.py +++ b/tests/regressiontests/max_lengths/models.py @@ -7,7 +7,7 @@ class PersonWithDefaultMaxLengths(models.Model): avatar = models.FilePathField() class PersonWithCustomMaxLengths(models.Model): - email = models.EmailField(max_length=384) - vcard = models.FileField(upload_to='/tmp', max_length=1024) - homepage = models.URLField(max_length=256) - avatar = models.FilePathField(max_length=512) + email = models.EmailField(max_length=250) + vcard = models.FileField(upload_to='/tmp', max_length=250) + homepage = models.URLField(max_length=250) + avatar = models.FilePathField(max_length=250) diff --git a/tests/regressiontests/max_lengths/tests.py b/tests/regressiontests/max_lengths/tests.py index fb62ce634a..0fb2f30e20 100644 --- a/tests/regressiontests/max_lengths/tests.py +++ b/tests/regressiontests/max_lengths/tests.py @@ -14,10 +14,10 @@ class MaxLengthArgumentsTests(TestCase): self.verify_max_length(PersonWithDefaultMaxLengths, 'avatar', 100) def test_custom_max_lengths(self): - self.verify_max_length(PersonWithCustomMaxLengths, 'email', 384) - self.verify_max_length(PersonWithCustomMaxLengths, 'vcard', 1024) - self.verify_max_length(PersonWithCustomMaxLengths, 'homepage', 256) - self.verify_max_length(PersonWithCustomMaxLengths, 'avatar', 512) + self.verify_max_length(PersonWithCustomMaxLengths, 'email', 250) + self.verify_max_length(PersonWithCustomMaxLengths, 'vcard', 250) + self.verify_max_length(PersonWithCustomMaxLengths, 'homepage', 250) + self.verify_max_length(PersonWithCustomMaxLengths, 'avatar', 250) class MaxLengthORMTests(TestCase):