From cd278aea75777bcaf3aa4cd4f94bc33ce50c7643 Mon Sep 17 00:00:00 2001 From: Bertrand Bordage Date: Tue, 17 Feb 2015 22:07:23 +0100 Subject: [PATCH] Moves a test method. --- cachalot/tests/write.py | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/cachalot/tests/write.py b/cachalot/tests/write.py index 0465b46..1313058 100644 --- a/cachalot/tests/write.py +++ b/cachalot/tests/write.py @@ -299,34 +299,6 @@ class WriteTestCase(TransactionTestCase): self.assertListEqual(data5, [user1, user2]) self.assertListEqual([u.n for u in data5], [3, 2]) - def test_invalidate_having(self): - with self.assertNumQueries(1): - data1 = list(User.objects.annotate(n=Count('user_permissions')) - .filter(n__gte=1)) - self.assertListEqual(data1, []) - - u = User.objects.create_user('user') - - with self.assertNumQueries(1): - data2 = list(User.objects.annotate(n=Count('user_permissions')) - .filter(n__gte=1)) - self.assertListEqual(data2, []) - - p = Permission.objects.first() - p.save() - - with self.assertNumQueries(1): - data3 = list(User.objects.annotate(n=Count('user_permissions')) - .filter(n__gte=1)) - self.assertListEqual(data3, []) - - u.user_permissions.add(p) - - with self.assertNumQueries(1): - data3 = list(User.objects.annotate(n=Count('user_permissions')) - .filter(n__gte=1)) - self.assertListEqual(data3, [u]) - def test_invalidate_subquery(self): with self.assertNumQueries(1): data1 = list(Test.objects.filter(owner__in=User.objects.all())) @@ -575,6 +547,34 @@ class WriteTestCase(TransactionTestCase): self.assertListEqual(data4, [t1, t2]) self.assertListEqual([o.username_length for o in data4], [4, 5]) + def test_invalidate_having(self): + with self.assertNumQueries(1): + data1 = list(User.objects.annotate(n=Count('user_permissions')) + .filter(n__gte=1)) + self.assertListEqual(data1, []) + + u = User.objects.create_user('user') + + with self.assertNumQueries(1): + data2 = list(User.objects.annotate(n=Count('user_permissions')) + .filter(n__gte=1)) + self.assertListEqual(data2, []) + + p = Permission.objects.first() + p.save() + + with self.assertNumQueries(1): + data3 = list(User.objects.annotate(n=Count('user_permissions')) + .filter(n__gte=1)) + self.assertListEqual(data3, []) + + u.user_permissions.add(p) + + with self.assertNumQueries(1): + data3 = list(User.objects.annotate(n=Count('user_permissions')) + .filter(n__gte=1)) + self.assertListEqual(data3, [u]) + def test_invalidate_extra_where(self): sql_condition = ("owner_id IN " "(SELECT id FROM auth_user WHERE username = 'admin')")