Merge pull request #1127 from filias/20142

Fixed #20142 -- Added error handling for fixture setup
2013-05-18 08:42:36 -07:00 · 2013-05-18 08:42:36 -07:00 · 5915800deb
parent dc8814bf7d 5883ae56b3
commit 5915800deb
1 changed files with 11 additions and 7 deletions
--- a/django/test/testcases.py
+++ b/django/test/testcases.py
@ -843,13 +843,17 @@ class TestCase(TransactionTestCase):

        for db in self._databases_names(include_mirrors=False):
            if hasattr(self, 'fixtures'):
-                call_command('loaddata', *self.fixtures,
-                             **{
-                                'verbosity': 0,
-                                'commit': False,
-                                'database': db,
-                                'skip_validation': True,
-                             })
+                try:
+                    call_command('loaddata', *self.fixtures,
+                                 **{
+                                    'verbosity': 0,
+                                    'commit': False,
+                                    'database': db,
+                                    'skip_validation': True,
+                                 })
+                except Exception:
+                    self._fixture_teardown()
+                    raise

    def _fixture_teardown(self):
        if not connections_support_transactions():