mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Imported override_settings from its new location.

Browse Source
This commit is contained in:
Aymeric Augustin
2013-12-23 16:01:13 +01:00
parent da16bb30ff
commit e32095616c
91 changed files with 113 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/transactions_regress/tests.py
View File

@@ -5,8 +5,8 @@ from unittest import skipIf, skipUnless, SkipTest
from django.db import (connection, connections, transaction, DEFAULT_DB_ALIAS, DatabaseError,
IntegrityError)
from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
from django.test import TransactionTestCase, skipUnlessDBFeature
from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
from django.test import TransactionTestCase, override_settings, skipUnlessDBFeature
from django.test.utils import IgnoreDeprecationWarningsMixin
from .models import Mod, M2mA, M2mB, SubMod