If a test app exists, reset it for each test

Conflicts: ckan/tests/helpers.py
ckan · Aug 26, 2016 · 00cfee0 · 00cfee0
1 parent e3d8ae2
commit 00cfee0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ckan/tests/helpers.py b/ckan/tests/helpers.py
@@ -187,7 +187,9 @@ def _apply_config_changes(cls, cfg):
     def setup(self):
         '''Reset the database and clear the search indexes.'''
         reset_db()
-        search.clear()
+        if hasattr(self, '_test_app'):
+            self._test_app.reset()
+        search.clear_all()
 
     @classmethod
     def teardown_class(cls):