Undo change to fixtures

ckanext/xloader/loader.py

@@ -322,7 +322,7 @@ def load_csv(csv_filepath, resource_id, mimetype='text/csv', logger=None):
     return fields, is_data_dict_populated
 
 def _is_data_dict_populated(fields, logger):
-    """Return True if the data_dict has been populated with the fields"""
+    """Return True if the data dictionary has been populated"""
     if (any((field for field in fields if field.get('info', {}).get('label'))) or
         any((field for field in fields if field.get('info', {}).get('notes'))) or
         any((field for field in fields if field.get('info', {}).get('type_override')))):

ckanext/xloader/tests/fixtures.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from sqlalchemy import orm
 import os
-import pytest
+
 from ckanext.datastore.tests import helpers as datastore_helpers
 from ckanext.xloader.loader import get_write_engine
 
@@ -99,6 +99,27 @@ def reset_index():
         """
         return search.clear_all
 
+    @pytest.fixture
+    def clean_db(reset_db):
+        """Resets the database to the initial state.
+
+        This can be used either for all tests in a class::
+
+            @pytest.mark.usefixtures("clean_db")
+            class TestExample(object):
+
+                def test_example(self):
+
+        or for a single test::
+
+            class TestExample(object):
+
+                @pytest.mark.usefixtures("clean_db")
+                def test_example(self):
+
+        """
+        reset_db()
+
     @pytest.fixture
     def clean_index(reset_index):
         """Clear search index before starting the test.