[142] Added tests for mapping and demapping overridden packets.

Author: 8r2y5

plugin_manager.py

@@ -255,8 +255,11 @@ def do(self, protocol, when, data):
             try:
                 plugin.protocol = protocol
                 res = packet_method(data)
-                if res is None:
+                if res is False:
+                    return False
+                elif res is None:
                     res = True
+
                 return_values.append(res)
             except:
                 self.logger.exception(

tests/test_base_plugin.py

@@ -9,7 +9,7 @@ def test_mapping_override_packets_dont_include_base_plugin(self):
         with self.assertRaises(AttributeError):
             base_plugin.overridden_packets
 
-    def test_activation_defactivation(self):
+    def test_activation_deactivation(self):
         class TestPlugin(BasePlugin):
             pass
 

tests/test_plugin_manager.py

@@ -105,6 +105,101 @@ def test_installed_plugins(self, mock_config, mock_path, mock_sys):
 
         self.assertListEqual(result, ['plugin'])
 
+    @patch('plugin_manager.sys')
+    @patch('plugin_manager.path')
+    @patch('plugin_manager.ConfigurationManager')
+    def test_de_map_plugin_packets(self, mock_config, mock_path, mock_sys):
+        mock_plugin = Mock()
+        mock_plugin.name = 'Test'
+
+        pm = PluginManager(Mock())
+        pm.packets = {
+            1: {
+                'on': {
+                    'Test': 'remove me'
+                },
+                'after': {'Test2': 'test'}
+            },
+            2: {
+                'on': {
+                    'Test': 'remove me',
+                    'Test3': 'test'
+                },
+                'after': {
+                    'Test': 'remove me'
+                },
+            }
+        }
+        pm.de_map_plugin_packets(mock_plugin)
+        self.assertDictEqual(
+            pm.packets,
+            {
+                1: {
+                    'on': {},
+                    'after': {'Test2': 'test'}
+                },
+                2: {
+                    'on': {
+                        'Test3': 'test'
+                    },
+                    'after': {},
+                }
+            }
+        )
+
+    @patch('plugin_manager.sys')
+    @patch('plugin_manager.path')
+    @patch('plugin_manager.ConfigurationManager')
+    def test_map_plugin_packets(self, mock_config, mock_path, mock_sys):
+        mock_plugin = Mock()
+        mock_plugin.name = 'Test'
+        mock_plugin.overridden_packets = {
+            1: {
+                'on': 'add me on 1',
+                'after': 'add me after 1'
+            }
+        }
+        mock_plugin2 = Mock()
+        mock_plugin2.name = 'Test2'
+        mock_plugin2.overridden_packets = {
+            2: {
+                'on': 'add me on 2'
+            },
+            3: {
+                'after': 'add me after 2'
+            }
+        }
+
+        pm = PluginManager(Mock())
+        pm.map_plugin_packets(mock_plugin)
+
+        self.assertDictEqual(
+            pm.packets,
+            {
+                1: {
+                    'on': {'Test': (mock_plugin, 'add me on 1')},
+                    'after': {'Test': (mock_plugin, 'add me after 1')}
+                }
+            }
+        )
+
+        pm.map_plugin_packets(mock_plugin2)
+        self.assertDictEqual(
+            pm.packets,
+            {
+                1: {
+                    'on': {'Test': (mock_plugin, 'add me on 1')},
+                    'after': {'Test': (mock_plugin, 'add me after 1')}
+                },
+                2: {
+                    'on': {'Test2': (mock_plugin2, 'add me on 2')}
+                },
+                3: {
+                    'after': {'Test2': (mock_plugin2, 'add me after 2')}
+                }
+            }
+        )
+
 
 class RouteTestCase(TestCase):
     @patch('plugin_manager.reactor')