Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cc-4105: made public method private

Browse source
This commit is contained in:
Rudi Grinberg 2012-07-19 11:13:15 -04:00
parent 885e1bffad
commit 09303a96d3
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/media-monitor2/media/monitor/airtime.py
View file

@ -72,13 +72,13 @@ class AirtimeMessageReceiver(Loggable):
evt = msg['event_type'] evt = msg['event_type']
del msg['event_type'] del msg['event_type']
self.logger.info("Handling RabbitMQ message: '%s'" % evt) self.logger.info("Handling RabbitMQ message: '%s'" % evt)
self.execute_message(evt,msg) self._execute_message(evt,msg)
return True return True
else: else:
self.logger.info("Received invalid message with 'event_type': '%s'" % msg['event_type']) self.logger.info("Received invalid message with 'event_type': '%s'" % msg['event_type'])
self.logger.info("Message details: %s" % str(msg)) self.logger.info("Message details: %s" % str(msg))
return False return False
def execute_message(self,evt,message): def _execute_message(self,evt,message):
self.dispatch_table[evt](message) self.dispatch_table[evt](message)
def supported_messages(self): def supported_messages(self):

6
python_apps/media-monitor2/tests/notifier.py
View file

@ -22,7 +22,9 @@ class TestReceiver(unittest.TestCase):
for event_type in self.amr.supported_messages(): for event_type in self.amr.supported_messages():
msg = { 'event_type' : event_type, 'extra_param' : 123 } msg = { 'event_type' : event_type, 'extra_param' : 123 }
filtered = filter_ev(msg) 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 mock_method.side_effect = None
ret = self.amr.message(msg) ret = self.amr.message(msg)
self.assertTrue(ret) self.assertTrue(ret)
@ -31,7 +33,7 @@ class TestReceiver(unittest.TestCase):
def test_no_mod_message(self): def test_no_mod_message(self):
ev = { 'event_type' : 'new_watch', 'directory' : 'something here' } ev = { 'event_type' : 'new_watch', 'directory' : 'something here' }
filtered = filter_ev(ev) 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" mock_method.return_value = "tested"
ret = self.amr.message(ev) ret = self.amr.message(ev)
self.assertTrue( ret ) # message passing worked self.assertTrue( ret ) # message passing worked