Merge lp:~dpb/tarmac/fix-odd-unit-test-bug-1258248 into lp:tarmac

[David Britton]

Use isolated test modules so as not to pollute import environment for tests down the line.

Fix for unit test bug described in the attached bug. Use isolated test modules so as not to pollute import environment for tests down the line.

[dobey (dobey)]

review: Approve

=== modified file 'tarmac/tests/test_plugin.py'
--- tarmac/tests/test_plugin.py	2013-11-06 14:53:03 +0000
+++ tarmac/tests/test_plugin.py	2014-02-27 22:27:53 +0000
@@ -72,9 +72,10 @@
     @patch('tarmac.plugin.execfile', create=True)
     def test_load_plugins(self, mocked):
         """Test that plug-ins load."""
-        for _plugin in plugin.find_plugins():
-            delattr(_mod_plugins, _plugin[0])
-            self.addCleanup(delattr, _mod_plugins, _plugin[0])
-
+        plugin_path = os.path.join(os.path.dirname(__file__), 'plugins')
+        self._patch_env('TARMAC_PLUGIN_PATH',
+                        '%s:%s' % (plugin_path, plugin_path))
+        plugin_name = 'testplugin'
+        self.addCleanup(delattr, _mod_plugins, plugin_name)
         plugin.load_plugins()
         self.assertTrue(mocked.call_count > 0)