summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-12-16 06:42:19 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-12-16 06:42:19 +0000
commitfddc0c589e03c1e5eb581aaa947a39720163d7d5 (patch)
tree908375c902b614d396fc6519fe7919b90561a961
parentb96b4509811d097a1217c065141f36be27f79823 (diff)
Removed one test that is only intended for PostgreSQL from the visibility 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
-rw-r--r--tests/modeltests/lookup/models.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/modeltests/lookup/models.py b/tests/modeltests/lookup/models.py
index bc291963e4..11e2b079f0 100644
--- a/tests/modeltests/lookup/models.py
+++ b/tests/modeltests/lookup/models.py
@@ -16,7 +16,7 @@ class Article(models.Model):
def __unicode__(self):
return self.headline
-__test__ = {'API_TESTS':r"""
+__test__ = {'API_TESTS': r"""
# Create a couple of Articles.
>>> from datetime import datetime
>>> a1 = Article(headline='Article 1', pub_date=datetime(2005, 7, 26))
@@ -33,13 +33,18 @@ __test__ = {'API_TESTS':r"""
>>> a6.save()
>>> a7 = Article(headline='Article 7', pub_date=datetime(2005, 7, 27))
>>> a7.save()
+"""}
+if settings.DATABASE_ENGINE in ('postgresql', 'postgresql_pysycopg2'):
+ __test__['API_TESTS'] += r"""
# text matching tests for PostgreSQL 8.3
>>> Article.objects.filter(id__iexact='1')
[<Article: Article 1>]
>>> 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>]
+"""
+__test__['API_TESTS'] += r"""
# Each QuerySet gets iterator(), which is a generator that "lazily" returns
# results using database-level iteration.
>>> for a in Article.objects.iterator():
@@ -383,7 +388,7 @@ FieldError: Join on field 'headline' not permitted. Did you misspell 'starts' fo
[<Article: barfoobaz>, <Article: baz>, <Article: bazbaRFOO>, <Article: foobarbaz>, <Article: foobaz>]
>>> Article.objects.filter(headline__iregex=r'b.*ar')
[<Article: bar>, <Article: barfoobaz>, <Article: bazbaRFOO>, <Article: foobar>, <Article: foobarbaz>]
-"""}
+"""
if settings.DATABASE_ENGINE != 'mysql':