summaryrefslogtreecommitdiff
path: root/tests/modeltests/basic/tests.py
diff options
context:
space:
mode:
authorAnssi Kääriäinen <akaariai@gmail.com>2012-04-20 11:09:32 +0000
committerAnssi Kääriäinen <akaariai@gmail.com>2012-04-20 11:09:32 +0000
commitd5b93d3281fe93cbef5de84a52001f64dbd839bd (patch)
tree3d445402e99f79f717602a6bc63561cd23ccdee8 /tests/modeltests/basic/tests.py
parenta901654a96dd4287ab3a700aff86bcac4b49f32a (diff)
Fixed #10494 -- Added kwargs to QuerySet.get() error message in the case no objects were found.
Thanks brondsem for the report, Szymon Pyzalski for the patch and oinopion for review. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/modeltests/basic/tests.py')
-rw-r--r--tests/modeltests/basic/tests.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/modeltests/basic/tests.py b/tests/modeltests/basic/tests.py
index f9141dc692..14d35cc644 100644
--- a/tests/modeltests/basic/tests.py
+++ b/tests/modeltests/basic/tests.py
@@ -83,14 +83,23 @@ class ModelTest(TestCase):
# parameters don't match any object.
self.assertRaisesRegexp(
ObjectDoesNotExist,
- "Article matching query does not exist.",
+ "Article matching query does not exist. Lookup parameters were "
+ "{'id__exact': 2000}",
Article.objects.get,
id__exact=2000,
)
-
+ # To avoid dict-ordering related errors check only one lookup
+ # in single assert.
+ self.assertRaisesRegexp(
+ ObjectDoesNotExist,
+ ".*'pub_date__year': 2005.*",
+ Article.objects.get,
+ pub_date__year=2005,
+ pub_date__month=8,
+ )
self.assertRaisesRegexp(
ObjectDoesNotExist,
- "Article matching query does not exist.",
+ ".*'pub_date__month': 8.*",
Article.objects.get,
pub_date__year=2005,
pub_date__month=8,
@@ -98,7 +107,8 @@ class ModelTest(TestCase):
self.assertRaisesRegexp(
ObjectDoesNotExist,
- "Article matching query does not exist.",
+ "Article matching query does not exist. Lookup parameters were "
+ "{'pub_date__week_day': 6}",
Article.objects.get,
pub_date__week_day=6,
)