diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-22 22:14:17 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-09-30 09:42:27 +0200 |
| commit | 728548e483a5a3486939b0c8e62520296587482e (patch) | |
| tree | b83663722c2653334085f2b152f8695f88660b8f /tests/custom_pk | |
| parent | 9595183d03cfd0d94ae2dd506a3d2b86cf5c74a7 (diff) | |
Fixed #21134 -- Prevented queries in broken transactions.
Squashed commit of the following:
commit 63ddb271a44df389b2c302e421fc17b7f0529755
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun Sep 29 22:51:00 2013 +0200
Clarified interactions between atomic and exceptions.
commit 2899ec299228217c876ba3aa4024e523a41c8504
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun Sep 22 22:45:32 2013 +0200
Fixed TransactionManagementError in tests.
Previous commit introduced an additional check to prevent running
queries in transactions that will be rolled back, which triggered a few
failures in the tests. In practice using transaction.atomic instead of
the low-level savepoint APIs was enough to fix the problems.
commit 4a639b059ea80aeb78f7f160a7d4b9f609b9c238
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Tue Sep 24 22:24:17 2013 +0200
Allowed nesting constraint_checks_disabled inside atomic.
Since MySQL handles transactions loosely, this isn't a problem.
commit 2a4ab1cb6e83391ff7e25d08479e230ca564bfef
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sat Sep 21 18:43:12 2013 +0200
Prevented running queries in transactions that will be rolled back.
This avoids a counter-intuitive behavior in an edge case on databases
with non-atomic transaction semantics.
It prevents using savepoint_rollback() inside an atomic block without
calling set_rollback(False) first, which is backwards-incompatible in
tests.
Refs #21134.
commit 8e3db393853c7ac64a445b66e57f3620a3fde7b0
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun Sep 22 22:14:17 2013 +0200
Replaced manual savepoints by atomic blocks.
This ensures the rollback flag is handled consistently in internal APIs.
Diffstat (limited to 'tests/custom_pk')
| -rw-r--r-- | tests/custom_pk/tests.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/tests/custom_pk/tests.py b/tests/custom_pk/tests.py index a452561edb..22369747a9 100644 --- a/tests/custom_pk/tests.py +++ b/tests/custom_pk/tests.py @@ -149,11 +149,9 @@ class CustomPKTests(TestCase): 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") |