mirror of
https://github.com/django/django.git
synced 2025-10-24 14:16:09 +00:00
Fixed DatabaseFeatures.uses_savepoints/can_release_savepoints and related tests with MyISAM storage engine.
This commit is contained in:
@@ -30,6 +30,7 @@ from django.contrib.contenttypes.models import ContentType
|
||||
from django.core import mail
|
||||
from django.core.checks import Error
|
||||
from django.core.files import temp as tempfile
|
||||
from django.db import connection
|
||||
from django.forms.utils import ErrorList
|
||||
from django.template.response import TemplateResponse
|
||||
from django.test import (
|
||||
@@ -7022,7 +7023,8 @@ class UserAdminTest(TestCase):
|
||||
# Don't depend on a warm cache, see #17377.
|
||||
ContentType.objects.clear_cache()
|
||||
|
||||
with self.assertNumQueries(10):
|
||||
expected_num_queries = 10 if connection.features.uses_savepoints else 8
|
||||
with self.assertNumQueries(expected_num_queries):
|
||||
response = self.client.get(reverse("admin:auth_user_change", args=(u.pk,)))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
@@ -7069,7 +7071,8 @@ class GroupAdminTest(TestCase):
|
||||
# Ensure no queries are skipped due to cached content type for Group.
|
||||
ContentType.objects.clear_cache()
|
||||
|
||||
with self.assertNumQueries(8):
|
||||
expected_num_queries = 8 if connection.features.uses_savepoints else 6
|
||||
with self.assertNumQueries(expected_num_queries):
|
||||
response = self.client.get(reverse("admin:auth_group_change", args=(g.pk,)))
|
||||
self.assertEqual(response.status_code, 200)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user