Clean up imports in datastore tests

ckan · Apr 24, 2013 · 5a27667 · 5a27667
1 parent d7414f4
commit 5a27667
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/ckanext/datastore/tests/test_create.py b/ckanext/datastore/tests/test_create.py
@@ -1,6 +1,7 @@
 import json
 import nose
 
+import pylons
 import sqlalchemy.orm as orm
 
 import ckan.plugins as p
@@ -25,7 +26,6 @@ def setup_class(cls):
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
-        import pylons
         engine = db._get_engine(None,
             {'connection_url': pylons.config['ckan.datastore.write_url']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
@@ -37,11 +37,10 @@ def teardown_class(cls):
 
     @classmethod
     def _configure_iconfigurable_plugins(cls):
-        import pylons.config as config
         from ckan.plugins import PluginImplementations
         from ckan.plugins.interfaces import IConfigurable
         for plugin in PluginImplementations(IConfigurable):
-            plugin.configure(config)
+            plugin.configure(pylons.config)
 
     def test_create_requires_auth(self):
         resource = model.Package.get('annakarenina').resources[0]

diff --git a/ckanext/datastore/tests/test_delete.py b/ckanext/datastore/tests/test_delete.py
@@ -1,6 +1,7 @@
 import json
 import nose
 
+import pylons
 import sqlalchemy
 import sqlalchemy.orm as orm
 
@@ -36,10 +37,6 @@ def setup_class(cls):
                         {'book': 'warandpeace', 'author': 'tolstoy'}]
         }
 
-        #model.repo.rebuild_db()
-        #model.repo.clean_db()
-
-        import pylons
         engine = db._get_engine(None,
             {'connection_url': pylons.config['ckan.datastore.write_url']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))

diff --git a/ckanext/datastore/tests/test_search.py b/ckanext/datastore/tests/test_search.py
@@ -62,7 +62,6 @@ def setup_class(cls):
                                  u'author': u'tolstoy',
                                  u'characters': None}]
 
-        import pylons
         engine = db._get_engine(
                 None,
                 {'connection_url': pylons.config['ckan.datastore.write_url']}
@@ -487,7 +486,6 @@ def setup_class(cls):
                                  u'published': None}]
         cls.expected_join_results = [{u'first': 1, u'second': 1}, {u'first': 1, u'second': 2}]
 
-        import pylons
         engine = db._get_engine(None,
             {'connection_url': pylons.config['ckan.datastore.write_url']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))

diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py
@@ -2,6 +2,7 @@
 import nose
 import datetime
 
+import pylons
 import sqlalchemy.orm as orm
 
 import ckan.plugins as p
@@ -47,7 +48,6 @@ 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']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
@@ -271,7 +271,6 @@ 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']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))
@@ -376,7 +375,6 @@ 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']})
         cls.Session = orm.scoped_session(orm.sessionmaker(bind=engine))