Fixed #12979 -- allowed using savepoints in TestCase (i.e. tests with transactions disabled), convert the GetOrCreate tests to use this.

alex · alex · commit 80aa4432e647 · 2010-10-09T06:06:24.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/test/testcases.py b/django/test/testcases.py
@@ -37,8 +37,6 @@ def to_list(value):
 real_rollback = transaction.rollback
 real_enter_transaction_management = transaction.enter_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
 
 def nop(*args, **kwargs):
@@ -47,17 +45,13 @@ def nop(*args, **kwargs):
 def disable_transaction_methods():
     transaction.commit = nop
     transaction.rollback = nop
-    transaction.savepoint_commit = nop
-    transaction.savepoint_rollback = nop
     transaction.enter_transaction_management = nop
     transaction.leave_transaction_management = nop
     transaction.managed = nop
 
 def restore_transaction_methods():
     transaction.commit = real_commit
     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.leave_transaction_management = real_leave_transaction_management
     transaction.managed = real_managed
diff --git a/tests/modeltests/get_or_create/tests.py b/tests/modeltests/get_or_create/tests.py
@@ -1,12 +1,12 @@
 from datetime import date
 
 from django.db import IntegrityError
-from django.test import TransactionTestCase
+from django.test import TestCase
 
 from models import Person, ManualPrimaryKeyTest
 
 
-class GetOrCreateTests(TransactionTestCase):
+class GetOrCreateTests(TestCase):
     def test_get_or_create(self):
         p = Person.objects.create(
             first_name='John', last_name='Lennon', birthday=date(1940, 10, 9)
