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

Removed legacy code from old transaction system

This commit is contained in:
Thomas Chaumeny 2014-11-09 22:24:22 +01:00
parent 88b2a20f04
commit 498ae3a360
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
django/test/testcases.py
View File

@ -58,24 +58,6 @@ def to_list(value):
value = [value] value = [value]
return value return value
real_commit = transaction.commit
real_rollback = transaction.rollback
def nop(*args, **kwargs):
return
def disable_transaction_methods():
transaction.commit = nop
transaction.rollback = nop
def restore_transaction_methods():
transaction.commit = real_commit
transaction.rollback = real_rollback
def assert_and_parse_html(self, html, user_msg, msg): def assert_and_parse_html(self, html, user_msg, msg):
try: try:
dom = parse_html(html) dom = parse_html(html)
@ -933,8 +915,6 @@ class TestCase(TransactionTestCase):
for db_name in self._databases_names(): for db_name in self._databases_names():
self.atomics[db_name] = transaction.atomic(using=db_name) self.atomics[db_name] = transaction.atomic(using=db_name)
self.atomics[db_name].__enter__() self.atomics[db_name].__enter__()
# Remove this when the legacy transaction management goes away.
disable_transaction_methods()
for db_name in self._databases_names(include_mirrors=False): for db_name in self._databases_names(include_mirrors=False):
if self.fixtures: if self.fixtures:
@ -953,11 +933,8 @@ class TestCase(TransactionTestCase):
if not connections_support_transactions(): if not connections_support_transactions():
return super(TestCase, self)._fixture_teardown() return super(TestCase, self)._fixture_teardown()
# Remove this when the legacy transaction management goes away.
restore_transaction_methods()
for db_name in reversed(self._databases_names()): for db_name in reversed(self._databases_names()):
# Hack to force a rollback transaction.set_rollback(True, using=db_name)
connections[db_name].needs_rollback = True
self.atomics[db_name].__exit__(None, None, None) self.atomics[db_name].__exit__(None, None, None)