From 04d773b3fbbead9c868e08b4bbee61646e372d14 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 18 Oct 2016 10:33:04 -0400 Subject: [PATCH] Get the test suite working agian for https://pagure.io/fm-orchestrator/pull-request/73 --- rida/models.py | 4 ++-- tests/test_messaging/test_messaging_functions.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rida/models.py b/rida/models.py index c7f8d631..e571a468 100644 --- a/rida/models.py +++ b/rida/models.py @@ -146,7 +146,7 @@ class ModuleBuild(RidaBase): session.add(module) session.commit() rida.messaging.publish( - modname='rida', + service='rida', topic='module.state.change', msg=module.json(), # Note the state is "init" here... conf=conf, @@ -165,7 +165,7 @@ class ModuleBuild(RidaBase): log.debug("%r, state %r->%r" % (self, old_state, self.state)) rida.messaging.publish( - modname='rida', + service='rida', topic='module.state.change', msg=self.json(), # Note the state is "init" here... conf=conf, diff --git a/tests/test_messaging/test_messaging_functions.py b/tests/test_messaging/test_messaging_functions.py index 30ca1afa..0783ea94 100644 --- a/tests/test_messaging/test_messaging_functions.py +++ b/tests/test_messaging/test_messaging_functions.py @@ -69,7 +69,7 @@ class TestUtilFunctions(unittest.TestCase): } mock_tail_messages.side_effect = \ lambda: [('fedora-infrastructure', endpoint, topic, msg)] - msg_obj = next(rida.messaging._fedmsg_listen()) + msg_obj = next(rida.messaging._fedmsg_listen(None)) self.assertEquals(type(msg_obj), rida.messaging.KojiBuildChange) self.assertEquals(msg_obj.build_id, 2345678) self.assertEquals(msg_obj.build_new_state, 0) @@ -99,7 +99,7 @@ class TestUtilFunctions(unittest.TestCase): } mock_tail_messages.side_effect = \ lambda: [('fedora-infrastructure', endpoint, topic, msg)] - msg_obj = next(rida.messaging._fedmsg_listen()) + msg_obj = next(rida.messaging._fedmsg_listen(None)) self.assertEquals(type(msg_obj), rida.messaging.KojiRepoChange) self.assertEquals(msg_obj.repo_tag, 'f23-build') self.assertEquals(msg_obj.msg_id, @@ -116,7 +116,7 @@ class TestUtilFunctions(unittest.TestCase): } mock_tail_messages.side_effect = \ lambda: [('fedora-infrastructure', endpoint, topic, msg)] - msg_obj = next(rida.messaging._fedmsg_listen()) + msg_obj = next(rida.messaging._fedmsg_listen(None)) self.assertEquals(msg_obj.module_build_id, msg['msg']['id']) self.assertEquals(msg_obj.module_build_state, msg['msg']['state']) self.assertEquals(msg_obj.msg_id,