p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed isolation of NonAutocommitTests.test_orm_query_after_error_and_rollback().

This commit is contained in:
Mariusz Felisiak 2021-07-09 07:38:31 +02:00 committed by GitHub
parent 7bb0605a8c
commit ae32e337e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/transactions/tests.py
View File

@ -477,12 +477,18 @@ class NonAutocommitTests(TransactionTestCase):
available_apps = [] available_apps = []
def setUp(self):
transaction.set_autocommit(False)
def tearDown(self):
transaction.rollback()
transaction.set_autocommit(True)
def test_orm_query_after_error_and_rollback(self): def test_orm_query_after_error_and_rollback(self):
""" """
ORM queries are allowed after an error and a rollback in non-autocommit ORM queries are allowed after an error and a rollback in non-autocommit
mode (#27504). mode (#27504).
""" """
transaction.set_autocommit(False)
r1 = Reporter.objects.create(first_name='Archibald', last_name='Haddock') r1 = Reporter.objects.create(first_name='Archibald', last_name='Haddock')
r2 = Reporter(first_name='Cuthbert', last_name='Calculus', id=r1.id) r2 = Reporter(first_name='Cuthbert', last_name='Calculus', id=r1.id)
with self.assertRaises(IntegrityError): with self.assertRaises(IntegrityError):
@ -492,12 +498,7 @@ class NonAutocommitTests(TransactionTestCase):
def test_orm_query_without_autocommit(self): def test_orm_query_without_autocommit(self):
"""#24921 -- ORM queries must be possible after set_autocommit(False).""" """#24921 -- ORM queries must be possible after set_autocommit(False)."""
transaction.set_autocommit(False) Reporter.objects.create(first_name="Tintin")
try:
Reporter.objects.create(first_name="Tintin")
finally:
transaction.rollback()
transaction.set_autocommit(True)
class DurableTests(TransactionTestCase): class DurableTests(TransactionTestCase):