Permalink
Browse files

[1.7.x] Fixed #22653 -- Added some database feature flags to tests.

Thanks Rahul Priyadarshi.

Backport of 99f5ea9 from master
  • Loading branch information...
1 parent 7bd2ad1 commit 45e47f7b95aad98d91bb40e19dda14ae120980a4 @timgraham timgraham committed Jun 11, 2014
@@ -28,7 +28,7 @@
from django.contrib.contenttypes.models import ContentType
from django.forms.utils import ErrorList
from django.template.response import TemplateResponse
-from django.test import TestCase
+from django.test import TestCase, skipUnlessDBFeature
from django.test.utils import patch_logger
from django.test import override_settings
from django.utils import formats
@@ -1527,6 +1527,7 @@ def test_no_standard_modeladmin_urls(self):
self.client.get('/test_admin/admin/logout/')
+@skipUnlessDBFeature('can_defer_constraint_checks')
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',))
class AdminViewDeletedObjectsTest(TestCase):
urls = "admin_views.urls"
@@ -405,6 +405,7 @@ def test_proxy_model_included(self):
% widget.pk
)
+ @skipUnlessDBFeature('supports_forward_references')
def test_loaddata_works_when_fixture_has_forward_refs(self):
"""
Regression for #3615 - Forward references cause fixtures not to load in MySQL (InnoDB)
@@ -429,6 +430,7 @@ def test_loaddata_raises_error_when_fixture_has_invalid_foreign_key(self):
verbosity=0,
)
+ @skipUnlessDBFeature('supports_forward_references')
@override_settings(FIXTURE_DIRS=[os.path.join(_cur_dir, 'fixtures_1'),
os.path.join(_cur_dir, 'fixtures_2')])
def test_loaddata_forward_refs_split_fixtures(self):
@@ -16,7 +16,7 @@
from django.core import management, serializers
from django.db import transaction, connection
-from django.test import TestCase, TransactionTestCase, override_settings
+from django.test import TestCase, TransactionTestCase, override_settings, skipUnlessDBFeature
from django.test.utils import Approximate
from django.utils import six
from django.utils.six import StringIO
@@ -267,6 +267,7 @@ class SerializersTransactionTestBase(object):
available_apps = ['serializers']
+ @skipUnlessDBFeature('supports_forward_references')
def test_forward_refs(self):
"""
Tests that objects ids can be referenced before they are
@@ -402,6 +402,7 @@ def inherited_compare(testcase, pk, klass, data):
# registered serializers are automatically tested.
+@skipUnlessDBFeature('can_defer_constraint_checks')
class SerializerTests(TestCase):
def test_get_unknown_serializer(self):
"""

0 comments on commit 45e47f7

Please sign in to comment.