From 40bfd8561d016f6632c95d03e46a720571ad1a8a Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 8 Jun 2014 22:42:12 +0200 Subject: Fixed #20420 -- Normalized query counts on Oracle. This is achieved by inserting a fake entry in connection.queries when not releasing a savepoint (since Oracle doesn't support that operation.) Also removed the can_release_savepoints feature that was recently added, but is superseded by this solution. --- tests/admin_views/tests.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'tests') diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 4b08956936..82cabc1cfb 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -3960,11 +3960,7 @@ class UserAdminTest(TestCase): # Don't depend on a warm cache, see #17377. ContentType.objects.clear_cache() - expected_queries = 10 - if not connection.features.can_release_savepoints: - expected_queries -= 1 - - with self.assertNumQueries(expected_queries): + with self.assertNumQueries(10): response = self.client.get('/test_admin/admin/auth/user/%s/' % u.pk) self.assertEqual(response.status_code, 200) @@ -4001,12 +3997,7 @@ class GroupAdminTest(TestCase): def test_group_permission_performance(self): g = Group.objects.create(name="test_group") - - expected_queries = 8 - if not connection.features.can_release_savepoints: - expected_queries -= 1 - - with self.assertNumQueries(expected_queries): + with self.assertNumQueries(8): response = self.client.get('/test_admin/admin/auth/group/%s/' % g.pk) self.assertEqual(response.status_code, 200) -- cgit v1.3