Commit ccab4b04 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #7981 -- Wrap the manual transaction management in the 

serializers_regress tests in some "try...finally" blocks. Patch from Leo Soto.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f4885517

tests/regressiontests/serializers_regress/tests.py

+20 −16
Original line number Diff line number Diff line
@@ -302,11 +302,13 @@ def serializerTest(format, self): 
    objects = []

    instance_count = {}

    transaction.enter_transaction_management()

    try:

        transaction.managed(True)

        for (func, pk, klass, datum) in test_data:

            objects.extend(func[0](pk, klass, datum))

            instance_count[klass] = 0

        transaction.commit()

    finally:

        transaction.leave_transaction_management()



    # Get a count of the number of objects created for each class
@@ -322,10 +324,12 @@ def serializerTest(format, self): 
    # Flush the database and recreate from the serialized data

    management.call_command('flush', verbosity=0, interactive=False)

    transaction.enter_transaction_management()

    try:

        transaction.managed(True)

        for obj in serializers.deserialize(format, serialized_data):

            obj.save()

        transaction.commit()

    finally:

        transaction.leave_transaction_management()



    # Assert that the deserialized data is the same