[#4430] test fixes

based on e1a3d05 by @tino097

ckan/config/environment.py

@@ -45,7 +45,10 @@ def load_environment(global_conf, app_conf):
     # Required by the deliverance plugin and iATI
     from pylons.wsgiapp import PylonsApp
     import pkg_resources
-    find_controller_generic = PylonsApp.find_controller
+    find_controller_generic = getattr(
+        PylonsApp.find_controller,
+        '_old_find_controller',
+        PylonsApp.find_controller)
 
     # This is from pylons 1.0 source, will monkey-patch into 0.9.7
     def find_controller(self, controller):
@@ -65,6 +68,7 @@ def find_controller(self, controller):
             self.controller_classes[controller] = mycontroller
             return mycontroller
         return find_controller_generic(self, controller)
+    find_controller._old_find_controller = find_controller_generic
     PylonsApp.find_controller = find_controller
 
     os.environ['CKAN_CONFIG'] = global_conf['__file__']

ckanext/imageview/tests/test_view.py

@@ -9,22 +9,7 @@
 
 
 class TestImageView(helpers.FunctionalTestBase):
-
-    @classmethod
-    def setup_class(cls):
-
-        super(TestImageView, cls).setup_class()
-
-        if not p.plugin_loaded('image_view'):
-            p.load('image_view')
-
-    @classmethod
-    def teardown_class(cls):
-        p.unload('image_view')
-
-        super(TestImageView, cls).teardown_class()
-
-        helpers.reset_db()
+    _load_plugins = ['image_view']
 
     @helpers.change_config('ckan.views.default_views', '')
     def test_view_shown_on_resource_page_with_image_url(self):