Revert "[#547] Resource proxy test changes"

This reverts commit fa137ca.

didn't help

ckanext/resourceproxy/tests/test_proxy.py

@@ -22,8 +22,8 @@ class TestProxyBasic(tests.WsgiAppCase, unittest.TestCase):
     @classmethod
     def setup_class(cls):
         cls._original_config = config.copy()
+        config['ckan.plugins'] = 'resource_proxy'
         wsgiapp = middleware.make_app(config['global_conf'], **config)
-        plugins.load('resource_proxy')
         cls.app = paste.fixture.TestApp(wsgiapp)
 
         if not cls.serving:
@@ -37,10 +37,10 @@ def setup_class(cls):
 
     @classmethod
     def teardown_class(cls):
-        plugins.unload('json_preview')
-        global config
-        config = cls._original_config
+        config.clear()
+        config.update(cls._original_config)
         model.repo.rebuild_db()
+        plugins.reset()
 
     def set_resource_url(self, url):
         testpackage = model.Package.get('annakarenina')