From cec4815c244bf977aadb027b1e48417072c722fc Mon Sep 17 00:00:00 2001
From: Sergey Motornyuk <sergey.motornyuk@linkdigital.com.au>
Date: Tue, 24 Sep 2019 09:29:35 +0300
Subject: [PATCH] Update tests

---
 ckanext/datapusher/tests/test_controller.py | 6 +++---
 ckanext/datastore/tests/test_dictionary.py  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ckanext/datapusher/tests/test_controller.py b/ckanext/datapusher/tests/test_controller.py
index 118ff7a086e..7d91401988f 100644
--- a/ckanext/datapusher/tests/test_controller.py
+++ b/ckanext/datapusher/tests/test_controller.py
@@ -3,11 +3,11 @@
 import nose
 
 import ckan.tests.legacy as tests
-from ckan.tests.helpers import FunctionalTestBase
+from ckanext.datastore.tests.helpers import DatastoreFunctionalTestBase
 import ckan.tests.factories as factories
 
 
-class TestController(FunctionalTestBase):
+class TestController(DatastoreFunctionalTestBase):
     sysadmin_user = None
     normal_user = None
 
@@ -15,10 +15,10 @@ class TestController(FunctionalTestBase):
 
     @classmethod
     def setup_class(cls):
-        cls.app = cls._get_test_app()
         if not tests.is_datastore_supported():
             raise nose.SkipTest(u'Datastore not supported')
         super(TestController, cls).setup_class()
+        cls.app = cls._get_test_app()
 
     def test_resource_data(self):
         user = factories.User()
diff --git a/ckanext/datastore/tests/test_dictionary.py b/ckanext/datastore/tests/test_dictionary.py
index bcc0b6daf39..7f6661e59c0 100644
--- a/ckanext/datastore/tests/test_dictionary.py
+++ b/ckanext/datastore/tests/test_dictionary.py
@@ -6,6 +6,7 @@
 
 
 class TestDatastoreDictionary(DatastoreFunctionalTestBase):
+    _load_plugins = (u'datastore', u'datapusher')
 
     @classmethod
     def setup_class(cls):