summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBryan Marty <bryanmarty@gmail.com>2015-10-29 23:24:46 -0700
committerTim Graham <timograham@gmail.com>2015-12-26 17:57:19 -0500
commit62ca2dea04489bdb23df1c7815439287c6d44630 (patch)
treeeb12cc7fef04d1bce3e1a3f6b1c14124884f6da0 /tests
parent2a7ce34600d0f879e93c9a5e02215948ed3bb6ac (diff)
Fixed #8065 -- Made id_list an optional argument for QuerySet.in_bulk().
Diffstat (limited to 'tests')
-rw-r--r--tests/lookup/tests.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
index 7e9f0921f8..203f25406a 100644
--- a/tests/lookup/tests.py
+++ b/tests/lookup/tests.py
@@ -116,6 +116,18 @@ class LookupTests(TestCase):
arts = Article.objects.in_bulk([self.a1.id, self.a2.id])
self.assertEqual(arts[self.a1.id], self.a1)
self.assertEqual(arts[self.a2.id], self.a2)
+ self.assertEqual(
+ Article.objects.in_bulk(),
+ {
+ self.a1.id: self.a1,
+ self.a2.id: self.a2,
+ self.a3.id: self.a3,
+ self.a4.id: self.a4,
+ self.a5.id: self.a5,
+ self.a6.id: self.a6,
+ self.a7.id: self.a7,
+ }
+ )
self.assertEqual(Article.objects.in_bulk([self.a3.id]), {self.a3.id: self.a3})
self.assertEqual(Article.objects.in_bulk({self.a3.id}), {self.a3.id: self.a3})
self.assertEqual(Article.objects.in_bulk(frozenset([self.a3.id])), {self.a3.id: self.a3})
@@ -124,7 +136,6 @@ class LookupTests(TestCase):
self.assertEqual(Article.objects.in_bulk([]), {})
self.assertEqual(Article.objects.in_bulk(iter([self.a1.id])), {self.a1.id: self.a1})
self.assertEqual(Article.objects.in_bulk(iter([])), {})
- self.assertRaises(TypeError, Article.objects.in_bulk)
self.assertRaises(TypeError, Article.objects.in_bulk, headline__startswith='Blah')
def test_values(self):