[142] Added cover to gitignore, updated unit tests

Author: 8r2y5

.gitignore

@@ -50,3 +50,5 @@ nosetests.xml
 
 # Mac cleanup
 .DS_Store
+
+cover

base_plugin.py

@@ -56,7 +56,7 @@ class BasePlugin(object):
     description = 'The common class for all plugins to inherit from.'
     version = '.1'
     depends = []
-    active = True
+    active = False
 
     def __init__(self, *args, **kwargs):
         super(BasePlugin, self).__init__(*args, **kwargs)
@@ -72,7 +72,6 @@ def activate(self):
         Called when the plugins are activated, do any setup work here.
         """
         self.active = True
-        self.logger.debug('%s plugin object activated.', self.name)
         return True
 
     def deactivate(self):
@@ -81,7 +80,6 @@ def deactivate(self):
         as it is likely that the plugin will soon be destroyed.
         """
         self.active = False
-        self.logger.debug('%s plugin object deactivated', self.name)
         return True
 
     def on_protocol_version(self, data):

tests/test_base_plugin.py

@@ -7,7 +7,19 @@ class BasePluginTestCase(TestCase):
     def test_mapping_override_packets_dont_include_base_plugin(self):
         base_plugin = BasePlugin()
         with self.assertRaises(AttributeError):
-            base_plugin.override_packets
+            base_plugin.overridden_packets
+
+    def test_activation_defactivation(self):
+        class TestPlugin(BasePlugin):
+            pass
+
+        test_plugin1 = TestPlugin()
+        self.assertFalse(test_plugin1.active)
+        self.assertTrue(test_plugin1.activate())
+        self.assertTrue(test_plugin1.active)
+
+        self.assertTrue(test_plugin1.deactivate())
+        self.assertFalse(test_plugin1.active)
 
     def test_mappig_override_packets(self):
         class TestPlugin(BasePlugin):
@@ -27,7 +39,7 @@ def after_burn_container(self, data):
         test_plugin2 = TestPlugin2()
         test_plugin = TestPlugin()
         self.assertDictEqual(
-            test_plugin.override_packets,
+            test_plugin.overridden_packets,
             {
                 5: {
                     'on': test_plugin.on_chat_received
@@ -38,11 +50,31 @@ def after_burn_container(self, data):
             }
         )
         self.assertDictEqual(
-            test_plugin2.override_packets,
+            test_plugin2.overridden_packets,
             {
                 44: {
                     'on': test_plugin2.on_burn_container,
                     'after': test_plugin2.after_burn_container
                 }
             }
         )
+
+    def test_unicode_str(self):
+        class TestPlugin(BasePlugin):
+            version = 1
+            pass
+
+        self.assertEqual(
+            str(TestPlugin()),
+            '<Plugin instance: Base Plugin (version 1)>'
+        )
+
+        self.assertEqual(
+            unicode(TestPlugin()),
+            '<Plugin instance: Base Plugin (version 1)>'
+        )
+
+        self.assertNotEqual(
+            repr(TestPlugin()),
+            '<Plugin instance: Base Plugin (version 1)>'
+        )

tests/test_plugin_manager.py

@@ -2,7 +2,7 @@
 
 from mock import Mock, patch, call
 
-from plugin_manager import PluginManager
+from plugin_manager import PluginManager, route
 
 
 class PluginManagetTestCase(TestCase):
@@ -62,6 +62,7 @@ def test_get_plugin_name_from_file(self):
         self.assertTrue(mock_f.isdir.called)
         self.assertFalse(mock_f.basename.called)
 
+    @patch.object(PluginManager, 'de_map_plugin_packets')
     @patch('plugin_manager.reversed')
     @patch('plugin_manager.sys')
     @patch('plugin_manager.path')
@@ -71,7 +72,8 @@ def test_deactivate_plugins(
         mock_config,
         mock_path,
         mock_sys,
-        mock_reversed
+        mock_reversed,
+        mock_de_map
     ):
         mock_reversed.side_effect = reversed
         pm = PluginManager(Mock())
@@ -84,6 +86,7 @@ def test_deactivate_plugins(
 
         mock_reversed.assert_called_with([1])
         self.assertTrue(pm.plugins[1].deactivate.called)
+        mock_de_map.assert_called_with(pm.plugins[1])
 
     @patch('plugin_manager.sys')
     @patch('plugin_manager.path')
@@ -101,3 +104,51 @@ def test_installed_plugins(self, mock_config, mock_path, mock_sys):
         result = pm.installed_plugins()
 
         self.assertListEqual(result, ['plugin'])
+
+
+class RouteTestCase(TestCase):
+    @patch('plugin_manager.reactor')
+    @patch('plugin_manager.deferLater')
+    @patch('plugin_manager.logging')
+    def test_route_response_true(self, mock_logging, mock_defer, mock_reactor):
+        test_func = Mock()
+        mock_pm = Mock()
+        mock_self = Mock()
+        mock_self.plugin_manager = mock_pm
+        add_err_back = Mock()
+        mock_defer.return_value = add_err_back
+        logger = Mock()
+        mock_logging.getLogger.return_value = logger
+
+        test_f = route(test_func)
+        test_f(mock_self, 'data')
+
+        mock_pm.do.assert_called_with(mock_self, 'on', 'data')
+        mock_defer.assert_called_with(
+            mock_reactor, .01, mock_pm.do, mock_self, 'after', 'data'
+        )
+        self.assertTrue(add_err_back.addErrback.called)
+        self.assertTrue(mock_logging.getLogger.called)
+
+        error_callback = add_err_back.addErrback.call_args[0][0]
+        self.assertFalse(logger.error.called)
+        error_callback('test')
+        self.assertTrue(logger.error.called)
+
+    @patch('plugin_manager.reactor')
+    @patch('plugin_manager.deferLater')
+    @patch('plugin_manager.logging')
+    def test_route_response_false(
+        self, mock_logging, mock_defer, mock_reactor
+    ):
+        test_func = Mock()
+        mock_pm = Mock()
+        mock_pm.do.return_value = False
+        mock_self = Mock()
+        mock_self.plugin_manager = mock_pm
+
+        test_f = route(test_func)
+        test_f(mock_self, 'data')
+
+        mock_pm.do.assert_called_with(mock_self, 'on', 'data')
+        self.assertFalse(mock_defer.called)