[1.7.x] 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.

Backport of 40bfd856 from master.

1 files changed, 2 insertions, 11 deletions

diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 21f1eb818c..957c7cd033 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -3962,11 +3962,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)
 
@@ -4003,12 +3999,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)