diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/custom_pk/tests.py | 16 | ||||
| -rw-r--r-- | tests/expressions/tests.py | 11 | ||||
| -rw-r--r-- | tests/force_insert_update/tests.py | 17 | ||||
| -rw-r--r-- | tests/one_to_one/tests.py | 6 | ||||
| -rw-r--r-- | tests/transactions/tests.py | 71 |
5 files changed, 70 insertions, 51 deletions
diff --git a/tests/custom_pk/tests.py b/tests/custom_pk/tests.py index 3f562f0bed..e2548b7b26 100644 --- a/tests/custom_pk/tests.py +++ b/tests/custom_pk/tests.py @@ -149,11 +149,9 @@ class CustomPKTests(TestCase): e = Employee.objects.create( employee_code=123, first_name="Frank", last_name="Jones" ) - sid = transaction.savepoint() - self.assertRaises(IntegrityError, - Employee.objects.create, employee_code=123, first_name="Fred", last_name="Jones" - ) - transaction.savepoint_rollback(sid) + with self.assertRaises(IntegrityError): + with transaction.atomic(): + Employee.objects.create(employee_code=123, first_name="Fred", last_name="Jones") def test_custom_field_pk(self): # Regression for #10785 -- Custom fields can be used for primary keys. @@ -175,8 +173,6 @@ class CustomPKTests(TestCase): def test_required_pk(self): # The primary key must be specified, so an error is raised if you # try to create an object without it. - sid = transaction.savepoint() - self.assertRaises(IntegrityError, - Employee.objects.create, first_name="Tom", last_name="Smith" - ) - transaction.savepoint_rollback(sid) + with self.assertRaises(IntegrityError): + with transaction.atomic(): + Employee.objects.create(first_name="Tom", last_name="Smith") diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index a351496442..3b875b6ee4 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.core.exceptions import FieldError from django.db.models import F +from django.db import transaction from django.test import TestCase from django.utils import six @@ -185,11 +186,11 @@ class ExpressionsTests(TestCase): "foo", ) - self.assertRaises(FieldError, - lambda: Company.objects.exclude( - ceo__firstname=F('point_of_contact__firstname') - ).update(name=F('point_of_contact__lastname')) - ) + with transaction.atomic(): + with self.assertRaises(FieldError): + Company.objects.exclude( + ceo__firstname=F('point_of_contact__firstname') + ).update(name=F('point_of_contact__lastname')) # F expressions can be used to update attributes on single objects test_gmbh = Company.objects.get(name="Test GmbH") diff --git a/tests/force_insert_update/tests.py b/tests/force_insert_update/tests.py index a5b2dcebb5..0a52600740 100644 --- a/tests/force_insert_update/tests.py +++ b/tests/force_insert_update/tests.py @@ -21,24 +21,29 @@ class ForceTests(TestCase): # Won't work because force_update and force_insert are mutually # exclusive c.value = 4 - self.assertRaises(ValueError, c.save, force_insert=True, force_update=True) + with self.assertRaises(ValueError): + c.save(force_insert=True, force_update=True) # Try to update something that doesn't have a primary key in the first # place. c1 = Counter(name="two", value=2) - self.assertRaises(ValueError, c1.save, force_update=True) + with self.assertRaises(ValueError): + with transaction.atomic(): + c1.save(force_update=True) c1.save(force_insert=True) # Won't work because we can't insert a pk of the same value. - sid = transaction.savepoint() c.value = 5 - self.assertRaises(IntegrityError, c.save, force_insert=True) - transaction.savepoint_rollback(sid) + with self.assertRaises(IntegrityError): + with transaction.atomic(): + c.save(force_insert=True) # Trying to update should still fail, even with manual primary keys, if # the data isn't in the database already. obj = WithCustomPK(name=1, value=1) - self.assertRaises(DatabaseError, obj.save, force_update=True) + with self.assertRaises(DatabaseError): + with transaction.atomic(): + obj.save(force_update=True) class InheritanceTests(TestCase): diff --git a/tests/one_to_one/tests.py b/tests/one_to_one/tests.py index a36764b788..7934855509 100644 --- a/tests/one_to_one/tests.py +++ b/tests/one_to_one/tests.py @@ -118,7 +118,7 @@ class OneToOneTests(TestCase): self.assertEqual(repr(o1.multimodel), '<MultiModel: Multimodel x1>') # This will fail because each one-to-one field must be unique (and # link2=o1 was used for x1, above). - sid = transaction.savepoint() mm = MultiModel(link1=self.p2, link2=o1, name="x1") - self.assertRaises(IntegrityError, mm.save) - transaction.savepoint_rollback(sid) + with self.assertRaises(IntegrityError): + with transaction.atomic(): + mm.save() diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py index 756fa40abd..e8b3488dd5 100644 --- a/tests/transactions/tests.py +++ b/tests/transactions/tests.py @@ -3,7 +3,7 @@ from __future__ import absolute_import import sys from django.db import connection, transaction, DatabaseError, IntegrityError -from django.test import TransactionTestCase, skipUnlessDBFeature +from django.test import TransactionTestCase, skipIfDBFeature, skipUnlessDBFeature from django.test.utils import IgnorePendingDeprecationWarningsMixin from django.utils import six from django.utils.unittest import skipIf, skipUnless @@ -204,10 +204,10 @@ class AtomicTests(TransactionTestCase): with transaction.atomic(savepoint=False): connection.cursor().execute( "SELECT no_such_col FROM transactions_reporter") - transaction.savepoint_rollback(sid) - # atomic block should rollback, but prevent it, as we just did it. + # prevent atomic from rolling back since we're recovering manually self.assertTrue(transaction.get_rollback()) transaction.set_rollback(False) + transaction.savepoint_rollback(sid) self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>']) @@ -267,11 +267,19 @@ class AtomicMergeTests(TransactionTestCase): with transaction.atomic(savepoint=False): Reporter.objects.create(first_name="Tournesol") raise Exception("Oops, that's his last name") - # It wasn't possible to roll back + # The third insert couldn't be roll back. Temporarily mark the + # connection as not needing rollback to check it. + self.assertTrue(transaction.get_rollback()) + transaction.set_rollback(False) self.assertEqual(Reporter.objects.count(), 3) - # It wasn't possible to roll back + transaction.set_rollback(True) + # The second insert couldn't be roll back. Temporarily mark the + # connection as not needing rollback to check it. + self.assertTrue(transaction.get_rollback()) + transaction.set_rollback(False) self.assertEqual(Reporter.objects.count(), 3) - # The outer block must roll back + transaction.set_rollback(True) + # The first block has a savepoint and must roll back. self.assertQuerysetEqual(Reporter.objects.all(), []) def test_merged_inner_savepoint_rollback(self): @@ -283,36 +291,22 @@ class AtomicMergeTests(TransactionTestCase): with transaction.atomic(savepoint=False): Reporter.objects.create(first_name="Tournesol") raise Exception("Oops, that's his last name") - # It wasn't possible to roll back + # The third insert couldn't be roll back. Temporarily mark the + # connection as not needing rollback to check it. + self.assertTrue(transaction.get_rollback()) + transaction.set_rollback(False) self.assertEqual(Reporter.objects.count(), 3) - # The first block with a savepoint must roll back + transaction.set_rollback(True) + # The second block has a savepoint and must roll back. self.assertEqual(Reporter.objects.count(), 1) self.assertQuerysetEqual(Reporter.objects.all(), ['<Reporter: Tintin>']) - def test_merged_outer_rollback_after_inner_failure_and_inner_success(self): - with transaction.atomic(): - Reporter.objects.create(first_name="Tintin") - # Inner block without a savepoint fails - with six.assertRaisesRegex(self, Exception, "Oops"): - with transaction.atomic(savepoint=False): - Reporter.objects.create(first_name="Haddock") - raise Exception("Oops, that's his last name") - # It wasn't possible to roll back - self.assertEqual(Reporter.objects.count(), 2) - # Inner block with a savepoint succeeds - with transaction.atomic(savepoint=False): - Reporter.objects.create(first_name="Archibald", last_name="Haddock") - # It still wasn't possible to roll back - self.assertEqual(Reporter.objects.count(), 3) - # The outer block must rollback - self.assertQuerysetEqual(Reporter.objects.all(), []) - @skipUnless(connection.features.uses_savepoints, "'atomic' requires transactions and savepoints.") class AtomicErrorsTests(TransactionTestCase): - available_apps = [] + available_apps = ['transactions'] def test_atomic_prevents_setting_autocommit(self): autocommit = transaction.get_autocommit() @@ -336,6 +330,29 @@ class AtomicErrorsTests(TransactionTestCase): with self.assertRaises(transaction.TransactionManagementError): transaction.leave_transaction_management() + def test_atomic_prevents_queries_in_broken_transaction(self): + r1 = Reporter.objects.create(first_name="Archibald", last_name="Haddock") + with transaction.atomic(): + r2 = Reporter(first_name="Cuthbert", last_name="Calculus", id=r1.id) + with self.assertRaises(IntegrityError): + r2.save(force_insert=True) + # The transaction is marked as needing rollback. + with self.assertRaises(transaction.TransactionManagementError): + r2.save(force_update=True) + self.assertEqual(Reporter.objects.get(pk=r1.pk).last_name, "Haddock") + + @skipIfDBFeature('atomic_transactions') + def test_atomic_allows_queries_after_fixing_transaction(self): + r1 = Reporter.objects.create(first_name="Archibald", last_name="Haddock") + with transaction.atomic(): + r2 = Reporter(first_name="Cuthbert", last_name="Calculus", id=r1.id) + with self.assertRaises(IntegrityError): + r2.save(force_insert=True) + # Mark the transaction as no longer needing rollback. + transaction.set_rollback(False) + r2.save(force_update=True) + self.assertEqual(Reporter.objects.get(pk=r1.pk).last_name, "Calculus") + class AtomicMiscTests(TransactionTestCase): |