Fix datastore_create tests

ckan/tests/config/test_middleware.py

@@ -288,7 +288,7 @@ def test_user_objects_in_g_anon_user(self, app):
                 extra_environ={u'REMOTE_USER': str(u'')},
             )
             assert flask.g.user == u''
-            assert flask.g.userobj == None
+            assert flask.g.userobj is None
             assert flask.g.author == u'Unknown IP Address'
             assert flask.g.remote_addr == u'Unknown IP Address'
 
@@ -349,7 +349,7 @@ def test_user_objects_in_c_anon_user(self, app):
 
         # tmpl_context available on response
         assert resp.tmpl_context.user == u''
-        assert resp.tmpl_context.userobj == None
+        assert resp.tmpl_context.userobj is None
         assert resp.tmpl_context.author == u'Unknown IP Address'
         assert resp.tmpl_context.remote_addr == u'Unknown IP Address'
 

ckan/tests/pytest/fixtures.py

@@ -26,24 +26,28 @@ def make_app(ckan_config):
     """
     return test_helpers._get_test_app
 
+
 @pytest.fixture
 def app(make_app):
     """Instance of client app.
     """
     return make_app()
 
+
 @pytest.fixture
 def reset_db():
     """Clear database.
     """
     test_helpers.reset_db()
 
+
 @pytest.fixture
 def reset_index():
     """Clear search index.
     """
     search.clear_all()
 
+
 @pytest.fixture
 def reset_all(reset_db, reset_index):
     """Clear database and search index.

ckanext/datastore/tests/conftest.py

@@ -0,0 +1,10 @@
+import pytest
+import ckanext.datastore.tests.helpers as test_helpers
+
+
+@pytest.fixture
+def reset_all(reset_all):
+    engine = test_helpers.db.get_write_engine()
+    test_helpers.rebuild_all_dbs(
+        test_helpers.orm.scoped_session(
+            test_helpers.orm.sessionmaker(bind=engine)))