add logic to check if 'find_controller' is allready patched, test_vie…

…w rewrite

ckan/config/environment.py

@@ -35,6 +35,8 @@
 # Suppress benign warning 'Unbuilt egg for setuptools'
 warnings.simplefilter('ignore', UserWarning)
 
+monkey_patched = False
+
 
 def load_environment(global_conf, app_conf):
     """
@@ -65,7 +67,10 @@ def find_controller(self, controller):
             self.controller_classes[controller] = mycontroller
             return mycontroller
         return find_controller_generic(self, controller)
-    PylonsApp.find_controller = find_controller
+    global monkey_patched
+    if not monkey_patched:
+        PylonsApp.find_controller = find_controller
+    monkey_patched = True
 
     os.environ['CKAN_CONFIG'] = global_conf['__file__']
 

ckanext/imageview/tests/test_view.py

@@ -11,21 +11,20 @@
 class TestImageView(helpers.FunctionalTestBase):
 
     @classmethod
-    def setup_class(cls):
+    def _apply_config_changes(cls, cfg):
+        cfg['ckan.plugins'] = 'image_view'
 
+    @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')
+        if p.plugin_loaded('example_idatasetform'):
+            p.unload('example_idatasetform')
 
         super(TestImageView, cls).teardown_class()
 
-        helpers.reset_db()
-
     @helpers.change_config('ckan.views.default_views', '')
     def test_view_shown_on_resource_page_with_image_url(self):
         app = self._get_test_app()