Skip to content

Commit

Permalink
Removed one test that is only intended for PostgreSQL from the visibi…
Browse files Browse the repository at this point in the history
…lity of

other databases. This basically hides an annoying warning when running the
tests under MySQL.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
malcolmt committed Dec 16, 2008
1 parent b96b450 commit fddc0c5
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions tests/modeltests/lookup/models.py
Expand Up @@ -16,7 +16,7 @@ class Meta:
def __unicode__(self): def __unicode__(self):
return self.headline return self.headline


__test__ = {'API_TESTS':r""" __test__ = {'API_TESTS': r"""
# Create a couple of Articles. # Create a couple of Articles.
>>> from datetime import datetime >>> from datetime import datetime
>>> a1 = Article(headline='Article 1', pub_date=datetime(2005, 7, 26)) >>> a1 = Article(headline='Article 1', pub_date=datetime(2005, 7, 26))
Expand All @@ -33,13 +33,18 @@ def __unicode__(self):
>>> a6.save() >>> a6.save()
>>> a7 = Article(headline='Article 7', pub_date=datetime(2005, 7, 27)) >>> a7 = Article(headline='Article 7', pub_date=datetime(2005, 7, 27))
>>> a7.save() >>> a7.save()
"""}


if settings.DATABASE_ENGINE in ('postgresql', 'postgresql_pysycopg2'):
__test__['API_TESTS'] += r"""
# text matching tests for PostgreSQL 8.3 # text matching tests for PostgreSQL 8.3
>>> Article.objects.filter(id__iexact='1') >>> Article.objects.filter(id__iexact='1')
[<Article: Article 1>] [<Article: Article 1>]
>>> Article.objects.filter(pub_date__startswith='2005') >>> Article.objects.filter(pub_date__startswith='2005')
[<Article: Article 5>, <Article: Article 6>, <Article: Article 4>, <Article: Article 2>, <Article: Article 3>, <Article: Article 7>, <Article: Article 1>] [<Article: Article 5>, <Article: Article 6>, <Article: Article 4>, <Article: Article 2>, <Article: Article 3>, <Article: Article 7>, <Article: Article 1>]
"""


__test__['API_TESTS'] += r"""
# Each QuerySet gets iterator(), which is a generator that "lazily" returns # Each QuerySet gets iterator(), which is a generator that "lazily" returns
# results using database-level iteration. # results using database-level iteration.
>>> for a in Article.objects.iterator(): >>> for a in Article.objects.iterator():
Expand Down Expand Up @@ -383,7 +388,7 @@ def __unicode__(self):
[<Article: barfoobaz>, <Article: baz>, <Article: bazbaRFOO>, <Article: foobarbaz>, <Article: foobaz>] [<Article: barfoobaz>, <Article: baz>, <Article: bazbaRFOO>, <Article: foobarbaz>, <Article: foobaz>]
>>> Article.objects.filter(headline__iregex=r'b.*ar') >>> Article.objects.filter(headline__iregex=r'b.*ar')
[<Article: bar>, <Article: barfoobaz>, <Article: bazbaRFOO>, <Article: foobar>, <Article: foobarbaz>] [<Article: bar>, <Article: barfoobaz>, <Article: bazbaRFOO>, <Article: foobar>, <Article: foobarbaz>]
"""} """




if settings.DATABASE_ENGINE != 'mysql': if settings.DATABASE_ENGINE != 'mysql':
Expand Down

0 comments on commit fddc0c5

Please sign in to comment.