[#642] Add plugin loading and unloading. This does not fix the single…

…ton issue but is better anyway.

ckanext/datastore/tests/test_configure.py

@@ -1,12 +1,16 @@
 import unittest
+import ckan.plugins as p
 from nose.tools import raises
 
 import ckanext.datastore.plugin as plugin
 
 
 class TestConfiguration(unittest.TestCase):
     def setUp(self):
-        self.p = plugin.DatastorePlugin()
+        self.p = p.load('datastore')
+
+    def tearDown(self):
+        p.unload('datastore')
 
     def test_legacy_mode_default(self):
         assert not self.p.legacy_mode
@@ -46,7 +50,7 @@ def test_same_ckan_and_datastore_db(self):
 
 class TestCheckUrlsAndPermissions(unittest.TestCase):
     def setUp(self):
-        self.p = plugin.DatastorePlugin()
+        self.p = p.load('datastore')
 
         self.p.legacy_mode = False
 
@@ -64,6 +68,9 @@ def raise_datastore_exception(message):
             raise plugin.DatastoreException(message)
         self.p._log_or_raise = raise_datastore_exception
 
+    def tearDown(self):
+        p.unload('datastore')
+
     def test_everything_correct_does_not_raise(self):
         self.p._check_urls_and_permissions()