Commit 5915800d authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Merge pull request #1127 from filias/20142 

Fixed #20142 -- Added error handling for fixture setup
parents dc8814bf 5883ae56

django/test/testcases.py

+11 −7
Original line number Diff line number Diff line
@@ -843,6 +843,7 @@ class TestCase(TransactionTestCase): 


        for db in self._databases_names(include_mirrors=False):

            if hasattr(self, 'fixtures'):

                try:

                    call_command('loaddata', *self.fixtures,

                                 **{

                                    'verbosity': 0,
@@ -850,6 +851,9 @@ class TestCase(TransactionTestCase): 
                                    'database': db,

                                    'skip_validation': True,

                                 })

                except Exception:

                    self._fixture_teardown()

                    raise



    def _fixture_teardown(self):

        if not connections_support_transactions():