Skip to content

Commit

Permalink
Fixed #12979 -- allowed using savepoints in TestCase (i.e. tests with…
Browse files Browse the repository at this point in the history
… transactions disabled), convert the GetOrCreate tests to use this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
alex committed Oct 9, 2010
1 parent c93f5e5 commit 80aa443
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
6 changes: 0 additions & 6 deletions django/test/testcases.py
Expand Up @@ -37,8 +37,6 @@ def to_list(value):
real_rollback = transaction.rollback real_rollback = transaction.rollback
real_enter_transaction_management = transaction.enter_transaction_management real_enter_transaction_management = transaction.enter_transaction_management
real_leave_transaction_management = transaction.leave_transaction_management real_leave_transaction_management = transaction.leave_transaction_management
real_savepoint_commit = transaction.savepoint_commit
real_savepoint_rollback = transaction.savepoint_rollback
real_managed = transaction.managed real_managed = transaction.managed


def nop(*args, **kwargs): def nop(*args, **kwargs):
Expand All @@ -47,17 +45,13 @@ def nop(*args, **kwargs):
def disable_transaction_methods(): def disable_transaction_methods():
transaction.commit = nop transaction.commit = nop
transaction.rollback = nop transaction.rollback = nop
transaction.savepoint_commit = nop
transaction.savepoint_rollback = nop
transaction.enter_transaction_management = nop transaction.enter_transaction_management = nop
transaction.leave_transaction_management = nop transaction.leave_transaction_management = nop
transaction.managed = nop transaction.managed = nop


def restore_transaction_methods(): def restore_transaction_methods():
transaction.commit = real_commit transaction.commit = real_commit
transaction.rollback = real_rollback transaction.rollback = real_rollback
transaction.savepoint_commit = real_savepoint_commit
transaction.savepoint_rollback = real_savepoint_rollback
transaction.enter_transaction_management = real_enter_transaction_management transaction.enter_transaction_management = real_enter_transaction_management
transaction.leave_transaction_management = real_leave_transaction_management transaction.leave_transaction_management = real_leave_transaction_management
transaction.managed = real_managed transaction.managed = real_managed
Expand Down
4 changes: 2 additions & 2 deletions tests/modeltests/get_or_create/tests.py
@@ -1,12 +1,12 @@
from datetime import date from datetime import date


from django.db import IntegrityError from django.db import IntegrityError
from django.test import TransactionTestCase from django.test import TestCase


from models import Person, ManualPrimaryKeyTest from models import Person, ManualPrimaryKeyTest




class GetOrCreateTests(TransactionTestCase): class GetOrCreateTests(TestCase):
def test_get_or_create(self): def test_get_or_create(self):
p = Person.objects.create( p = Person.objects.create(
first_name='John', last_name='Lennon', birthday=date(1940, 10, 9) first_name='John', last_name='Lennon', birthday=date(1940, 10, 9)
Expand Down

0 comments on commit 80aa443

Please sign in to comment.