diff options
| author | Tim Graham <timograham@gmail.com> | 2014-06-11 11:45:18 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-11 11:48:57 -0400 |
| commit | 45e47f7b95aad98d91bb40e19dda14ae120980a4 (patch) | |
| tree | ed3c93e8531bf4880b00677ba64685a635694a8e | |
| parent | 7bd2ad1dd9fc449ed1b4832fab5c975d7c8aa895 (diff) | |
[1.7.x] Fixed #22653 -- Added some database feature flags to tests.
Thanks Rahul Priyadarshi.
Backport of 99f5ea9cc8 from master
| -rw-r--r-- | tests/admin_views/tests.py | 3 | ||||
| -rw-r--r-- | tests/fixtures_regress/tests.py | 2 | ||||
| -rw-r--r-- | tests/serializers/tests.py | 3 | ||||
| -rw-r--r-- | tests/serializers_regress/tests.py | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 7187232d84..f8bfcf82c5 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -28,7 +28,7 @@ from django.contrib.auth.models import Group, User, Permission 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 @@ class AdminViewsNoUrlTest(TestCase): 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" diff --git a/tests/fixtures_regress/tests.py b/tests/fixtures_regress/tests.py index f99bcbe378..400ca04036 100644 --- a/tests/fixtures_regress/tests.py +++ b/tests/fixtures_regress/tests.py @@ -405,6 +405,7 @@ class TestFixtures(TestCase): % 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 @@ class TestFixtures(TestCase): 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): diff --git a/tests/serializers/tests.py b/tests/serializers/tests.py index 6433101878..4be0e6e322 100644 --- a/tests/serializers/tests.py +++ b/tests/serializers/tests.py @@ -16,7 +16,7 @@ except ImportError: 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 diff --git a/tests/serializers_regress/tests.py b/tests/serializers_regress/tests.py index 22db69ba13..d111a7d719 100644 --- a/tests/serializers_regress/tests.py +++ b/tests/serializers_regress/tests.py @@ -402,6 +402,7 @@ if connection.features.allows_auto_pk_0: # registered serializers are automatically tested. +@skipUnlessDBFeature('can_defer_constraint_checks') class SerializerTests(TestCase): def test_get_unknown_serializer(self): """ |
