Author: kmtracey
Date: 2009-01-18 16:09:56 -0600 (Sun, 18 Jan 2009)
New Revision: 9774
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/tests/regressiontests/serializers_regress/tests.py
Log:
[1.0.X] Corrected code in serializers_regress testcase so that, in the case
where an exception has been raised, rollback is called before attempting to
leave transaction management. With the old code the original exception
(IntegrityError on InnoDB) was getting hidden by a transaction management error
resulting from attempting to leave transaction management with a pending
commit/rollback.
r9773 from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9771
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9773
Modified:
django/branches/releases/1.0.X/tests/regressiontests/serializers_regress/tests.py
===================================================================
---
django/branches/releases/1.0.X/tests/regressiontests/serializers_regress/tests.py
2009-01-18 20:54:42 UTC (rev 9773)
+++
django/branches/releases/1.0.X/tests/regressiontests/serializers_regress/tests.py
2009-01-18 22:09:56 UTC (rev 9774)
@@ -360,8 +360,11 @@
objects.extend(func[0](pk, klass, datum))
instance_count[klass] = 0
transaction.commit()
- finally:
+ except:
+ transaction.rollback()
transaction.leave_transaction_management()
+ raise
+ transaction.leave_transaction_management()
# Get a count of the number of objects created for each class
for klass in instance_count:
@@ -381,8 +384,11 @@
for obj in serializers.deserialize(format, serialized_data):
obj.save()
transaction.commit()
- finally:
+ except:
+ transaction.rollback()
transaction.leave_transaction_management()
+ raise
+ transaction.leave_transaction_management()
# Assert that the deserialized data is the same
# as the original source
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
