[#547] Test fixes for datastore

ckan · Jun 12, 2013 · 2c42791 · 2c42791
1 parent 42a09a6
commit 2c42791
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/ckanext/datastore/tests/test_configure.py b/ckanext/datastore/tests/test_configure.py
@@ -3,7 +3,7 @@
 import pyutilib.component.core
 
 import ckan.plugins
-import ckanext.datastore.plugin as plugin
+#import ckanext.datastore.plugin as plugin
 
 
 class _TestConfiguration(unittest.TestCase):

diff --git a/ckanext/datastore/tests/test_create.py b/ckanext/datastore/tests/test_create.py
@@ -22,7 +22,6 @@ def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
-        cls._configure_iconfigurable_plugins()
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
@@ -35,13 +34,6 @@ def teardown_class(cls):
         rebuild_all_dbs(cls.Session)
         p.unload('datastore')
 
-    @classmethod
-    def _configure_iconfigurable_plugins(cls):
-        from ckan.plugins import PluginImplementations
-        from ckan.plugins.interfaces import IConfigurable
-        for plugin in PluginImplementations(IConfigurable):
-            plugin.configure(pylons.config)
-
     def test_create_requires_auth(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {

diff --git a/ckanext/datastore/tests/test_dump.py b/ckanext/datastore/tests/test_dump.py
@@ -4,9 +4,7 @@
 from nose.tools import assert_equals
 from pylons import config
 import sqlalchemy.orm as orm
-import paste.fixture
 
-import ckan.config.middleware as middleware
 import ckan.plugins as p
 import ckan.lib.create_test_data as ctd
 import ckan.model as model
@@ -50,22 +48,14 @@ def setup_class(cls):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is True
 
-        import pylons
         engine = db._get_engine(None, {
-            'connection_url': pylons.config['ckan.datastore.write_url']})
+            'connection_url': config['ckan.datastore.write_url']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
 
-        cls._original_config = config.copy()
-        config['ckan.plugins'] = 'datastore'
-        wsgiapp = middleware.make_app(config['global_conf'], **config)
-        cls.app = paste.fixture.TestApp(wsgiapp)
-
     @classmethod
     def teardown_class(cls):
         helpers.rebuild_all_dbs(cls.Session)
         p.unload('datastore')
-        config.clear()
-        config.update(cls._original_config)
 
     def test_dump_basic(self):
         auth = {'Authorization': str(self.normal_user.apikey)}

diff --git a/ckanext/datastore/tests/test_search.py b/ckanext/datastore/tests/test_search.py
@@ -475,7 +475,6 @@ def setup_class(cls):
         if not tests.is_datastore_supported():
             raise nose.SkipTest("Datastore not supported")
         plugin = p.load('datastore')
-        plugin.configure(pylons.config)
         if plugin.legacy_mode:
             # make sure we undo adding the plugin
             p.unload('datastore')