Ticket #21089: ticket-21089.diff

django/test/testcases.py

@@ -699 +699 @@
     # Subclasses can enable only a subset of apps for faster tests
     available_apps = None
 
+    # Subclasses can define fixtures which will be automatically installed
+    fixtures = None
+
     def _pre_setup(self):
         """Performs any pre-test setup. This includes:
 
@@ -746 +749 @@
             if self.reset_sequences:
                 self._reset_sequences(db_name)
 
-            if hasattr(self, 'fixtures'):
-                # We have to use this slightly awkward syntax due to the fact
-                # that we're using *args and **kwargs together.
-                call_command('loaddata', *self.fixtures,
-                             **{'verbosity': 0, 'database': db_name, 'skip_validation': True})
+            if self.fixtures:
+                call_command('loaddata', *self.fixtures, verbosity=0,
+                             database=db_name, skip_validation=True)
 
     def _post_teardown(self):
         """Performs any post-test things. This includes:
@@ -838 +839 @@
         disable_transaction_methods()
 
         for db_name in self._databases_names(include_mirrors=False):
-            if hasattr(self, 'fixtures'):
+            if self.fixtures:
                 try:
                     call_command('loaddata', *self.fixtures,
-                                 **{
-                                    'verbosity': 0,
-                                    'commit': False,
-                                    'database': db_name,
-                                    'skip_validation': True,
-                                 })
+                                 verbosity=0,
+                                 commit=False,
+                                 database=db_name,
+                                 skip_validation=True,
+                    )
                 except Exception:
                     self._fixture_teardown()
                     raise