particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tests

Browse source
This commit is contained in:
Tomas Kopecek 2020-03-30 14:31:09 +02:00
parent f039220a9c
commit 475bf17f05
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/hub/protonmsg.py
View file

@ -23,6 +23,7 @@ CONFIG_FILE = '/etc/koji-hub/plugins/protonmsg.conf'
CONFIG = None
LOG = logging.getLogger('koji.plugin.protonmsg')
class TimeoutHandler(MessagingHandler):
def __init__(self, url, msgs, conf, *args, **kws):
super(TimeoutHandler, self).__init__(*args, **kws)
@ -145,7 +146,8 @@ def _strip_extra(buildinfo):
extra_limit = CONFIG.getint('message', 'extra_limit')
extra_size = len(json.dumps(buildinfo.get('extra', {}), default=json_serialize))
if extra_limit and extra_size > extra_limit:
LOG.debug("Dropping 'extra' from build %s (length: %d > %d)" % (buildinfo['nvr'], extra_size, extra_limit))
LOG.debug("Dropping 'extra' from build %s (length: %d > %d)" %
(buildinfo['nvr'], extra_size, extra_limit))
buildinfo = buildinfo.copy()
del buildinfo['extra']
return buildinfo

17
tests/test_plugins/test_protonmsg.py
View file

@ -28,6 +28,7 @@ extra_limit = 2048
self.conf.flush()
protonmsg.CONFIG_FILE = self.conf.name
protonmsg.CONFIG = None
protonmsg.LOG = MagicMock()
def tearDown(self):
if hasattr(context, 'protonmsg_msgs'):
@ -206,11 +207,11 @@ extra_limit = 2048
self.assertEqual(Container.call_count, 0)
@patch('protonmsg.Container')
@patch('logging.getLogger')
def test_send_queued_msgs_fail(self, getLogger, Container):
def test_send_queued_msgs_fail(self, Container):
context.protonmsg_msgs = [('test.topic', {'testheader': 1}, 'test body')]
protonmsg.send_queued_msgs('postCommit')
log = getLogger.return_value
log = protonmsg.LOG
self.assertEqual(log.debug.call_count, 2)
for args in log.debug.call_args_list:
self.assertTrue(args[0][0].startswith('could not send'))
@ -218,21 +219,19 @@ extra_limit = 2048
self.assertTrue(log.error.call_args[0][0].startswith('could not send'))
@patch('protonmsg.Container')
@patch('logging.getLogger')
def test_send_queued_msgs_success(self, getLogger, Container):
def test_send_queued_msgs_success(self, Container):
context.protonmsg_msgs = [('test.topic', {'testheader': 1}, 'test body')]
def clear_msgs():
del context.protonmsg_msgs[:]
Container.return_value.run.side_effect = clear_msgs
protonmsg.send_queued_msgs('postCommit')
log = getLogger.return_value
log = protonmsg.LOG
self.assertEqual(log.debug.call_count, 1)
self.assertTrue(log.debug.args[0][0].startswith('all msgs sent'))
self.assertEqual(log.error.call_count, 0)
@patch('protonmsg.Container')
@patch('logging.getLogger')
def test_send_queued_msgs_test_mode(self, getLogger, Container):
def test_send_queued_msgs_test_mode(self, Container):
context.protonmsg_msgs = [('test.topic', {'testheader': 1}, 'test body')]
conf = tempfile.NamedTemporaryFile()
conf.write(six.b("""[broker]
@ -252,7 +251,7 @@ test_mode = on
Container.return_value.run.side_effect = clear_msgs
protonmsg.send_queued_msgs('postCommit')
Container.assert_not_called()
log = getLogger.return_value
log = protonmsg.LOG
self.assertEqual(log.debug.call_count, len(context.protonmsg_msgs) + 1)
self.assertTrue(log.debug.args[0][0].startswith('all msgs sent'))
self.assertEqual(log.error.call_count, 0)