From fd8570d2bdae9c0efa4fa278f66501e2c10e77bc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Oct 24 2017 20:02:49 +0000 Subject: No need to prepend greenwave to the topic. ... fedmsg does this for you. See the example of what we publish here: https://apps.fedoraproject.org/datagrepper/id?id=2017-5ee197f3-dcc7-4cd6-af54-c5c448e0fe94&is_raw=true&size=extra-large The `greenwave` segment appears twice. No need for that. --- diff --git a/functional-tests/consumers/test_resultsdb.py b/functional-tests/consumers/test_resultsdb.py index 9551019..58a7d33 100644 --- a/functional-tests/consumers/test_resultsdb.py +++ b/functional-tests/consumers/test_resultsdb.py @@ -92,7 +92,7 @@ def test_consume_new_result( 'previous': old_decision, } mock_fedmsg.assert_called_once_with( - topic='greenwave.decision.update', msg=msg) + topic='decision.update', msg=msg) @mock.patch('greenwave.consumers.resultsdb.fedmsg.config.load_config') diff --git a/functional-tests/consumers/test_waiverdb.py b/functional-tests/consumers/test_waiverdb.py index 5b0ff5a..9bcad24 100644 --- a/functional-tests/consumers/test_waiverdb.py +++ b/functional-tests/consumers/test_waiverdb.py @@ -80,4 +80,4 @@ def test_consume_new_waiver( 'previous': old_decision, } mock_fedmsg.assert_called_once_with( - topic='greenwave.decision.update', msg=msg) + topic='decision.update', msg=msg) diff --git a/greenwave/consumers/resultsdb.py b/greenwave/consumers/resultsdb.py index 14b19dc..1114ea0 100644 --- a/greenwave/consumers/resultsdb.py +++ b/greenwave/consumers/resultsdb.py @@ -124,7 +124,7 @@ class ResultsDBHandler(fedmsg.consumers.FedmsgConsumer): }) log.debug('Emitted a fedmsg, %r, on the "%s" topic', msg, 'greenwave.decision.update') - fedmsg.publish(topic='greenwave.decision.update', msg=msg) + fedmsg.publish(topic='decision.update', msg=msg) def _invalidate_cache(self, message): """ diff --git a/greenwave/consumers/waiverdb.py b/greenwave/consumers/waiverdb.py index bea36d1..a1a245f 100644 --- a/greenwave/consumers/waiverdb.py +++ b/greenwave/consumers/waiverdb.py @@ -110,4 +110,4 @@ class WaiverDBHandler(fedmsg.consumers.FedmsgConsumer): }) log.debug('Emitted a fedmsg, %r, on the "%s" topic', msg, 'greenwave.decision.update') - fedmsg.publish(topic='greenwave.decision.update', msg=msg) + fedmsg.publish(topic='decision.update', msg=msg)