From 7caf21aa2ebfa5f696fde1fb7e5c11fafb2ef050 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Thu, 7 May 2009 18:06:22 +0000 Subject: [PATCH] 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. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10697 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/aggregation/models.py | 6 +++--- tests/regressiontests/aggregation_regress/models.py | 6 +++--- tests/regressiontests/forms/models.py | 4 ++-- tests/regressiontests/max_lengths/models.py | 8 ++++---- tests/regressiontests/max_lengths/tests.py | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/modeltests/aggregation/models.py b/tests/modeltests/aggregation/models.py index ba2ec3a212..9ed638ea80 100644 --- a/tests/modeltests/aggregation/models.py +++ b/tests/modeltests/aggregation/models.py @@ -15,7 +15,7 @@ class Author(models.Model): return self.name class Publisher(models.Model): - name = models.CharField(max_length=300) + name = models.CharField(max_length=255) num_awards = models.IntegerField() def __unicode__(self): @@ -23,7 +23,7 @@ class Publisher(models.Model): class Book(models.Model): isbn = models.CharField(max_length=9) - name = models.CharField(max_length=300) + name = models.CharField(max_length=255) pages = models.IntegerField() rating = models.FloatField() price = models.DecimalField(decimal_places=2, max_digits=6) @@ -36,7 +36,7 @@ class Book(models.Model): return self.name class Store(models.Model): - name = models.CharField(max_length=300) + name = models.CharField(max_length=255) books = models.ManyToManyField(Book) original_opening = models.DateTimeField() friday_night_closing = models.TimeField() diff --git a/tests/regressiontests/aggregation_regress/models.py b/tests/regressiontests/aggregation_regress/models.py index d1f1451e43..2a23b922b4 100644 --- a/tests/regressiontests/aggregation_regress/models.py +++ b/tests/regressiontests/aggregation_regress/models.py @@ -18,7 +18,7 @@ class Author(models.Model): return self.name class Publisher(models.Model): - name = models.CharField(max_length=300) + name = models.CharField(max_length=255) num_awards = models.IntegerField() def __unicode__(self): @@ -26,7 +26,7 @@ class Publisher(models.Model): class Book(models.Model): isbn = models.CharField(max_length=9) - name = models.CharField(max_length=300) + name = models.CharField(max_length=255) pages = models.IntegerField() rating = models.FloatField() price = models.DecimalField(decimal_places=2, max_digits=6) @@ -42,7 +42,7 @@ class Book(models.Model): return self.name class Store(models.Model): - name = models.CharField(max_length=300) + name = models.CharField(max_length=255) books = models.ManyToManyField(Book) original_opening = models.DateTimeField() friday_night_closing = models.TimeField() diff --git a/tests/regressiontests/forms/models.py b/tests/regressiontests/forms/models.py index 8a5e3124a2..472a39d35e 100644 --- a/tests/regressiontests/forms/models.py +++ b/tests/regressiontests/forms/models.py @@ -16,7 +16,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) @@ -88,7 +88,7 @@ datetime.date(1969, 4, 4) >>> from django.forms import CharField >>> class ExcludingForm(ModelForm): -... name = CharField(max_length=256) +... name = CharField(max_length=255) ... class Meta: ... model = Defaults ... exclude = ['name'] 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):