From 09303a96d3736299aef7359fa55e2422804ca393 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 19 Jul 2012 11:13:15 -0400 Subject: [PATCH] cc-4105: made public method private --- python_apps/media-monitor2/media/monitor/airtime.py | 4 ++-- python_apps/media-monitor2/tests/notifier.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/airtime.py b/python_apps/media-monitor2/media/monitor/airtime.py index b827035cf..4a21a3bf6 100644 --- a/python_apps/media-monitor2/media/monitor/airtime.py +++ b/python_apps/media-monitor2/media/monitor/airtime.py @@ -72,13 +72,13 @@ class AirtimeMessageReceiver(Loggable): evt = msg['event_type'] del msg['event_type'] self.logger.info("Handling RabbitMQ message: '%s'" % evt) - self.execute_message(evt,msg) + self._execute_message(evt,msg) return True else: self.logger.info("Received invalid message with 'event_type': '%s'" % msg['event_type']) self.logger.info("Message details: %s" % str(msg)) return False - def execute_message(self,evt,message): + def _execute_message(self,evt,message): self.dispatch_table[evt](message) def supported_messages(self): diff --git a/python_apps/media-monitor2/tests/notifier.py b/python_apps/media-monitor2/tests/notifier.py index 05cc5f502..e56bdc99f 100644 --- a/python_apps/media-monitor2/tests/notifier.py +++ b/python_apps/media-monitor2/tests/notifier.py @@ -22,7 +22,9 @@ class TestReceiver(unittest.TestCase): for event_type in self.amr.supported_messages(): msg = { 'event_type' : event_type, 'extra_param' : 123 } filtered = filter_ev(msg) - with patch.object(self.amr, 'execute_message') as mock_method: + # There should be a better way to test the following without + # patching private methods + with patch.object(self.amr, '_execute_message') as mock_method: mock_method.side_effect = None ret = self.amr.message(msg) self.assertTrue(ret) @@ -31,7 +33,7 @@ class TestReceiver(unittest.TestCase): def test_no_mod_message(self): ev = { 'event_type' : 'new_watch', 'directory' : 'something here' } filtered = filter_ev(ev) - with patch.object(self.amr, 'execute_message') as mock_method: + with patch.object(self.amr, '_execute_message') as mock_method: mock_method.return_value = "tested" ret = self.amr.message(ev) self.assertTrue( ret ) # message passing worked