From 506e59558c2da7369812616eaef61b3d5bd586b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Thu, 21 Jul 2022 14:57:11 +0200 Subject: [PATCH] Use correct topic for scm_request_processor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Pagure messages are not sent with org.fedoraproject. prefix, but with io.pagure. prefix. Signed-off-by: Michal Konečný --- tests/plugins/test_scm_request_processor.py | 18 +++++++++--------- toddlers/plugins/scm_request_processor.py | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/plugins/test_scm_request_processor.py b/tests/plugins/test_scm_request_processor.py index 4b8d13f..547512b 100644 --- a/tests/plugins/test_scm_request_processor.py +++ b/tests/plugins/test_scm_request_processor.py @@ -31,15 +31,15 @@ class TestAcceptsTopic: @pytest.mark.parametrize( "topic", [ - "org.fedoraproject.*.pagure.issue.new", - "org.fedoraproject.*.pagure.issue.edit", - "org.fedoraproject.*.pagure.issue.comment.added", - "org.fedoraproject.stg.pagure.issue.new", - "org.fedoraproject.stg.pagure.issue.edit", - "org.fedoraproject.stg.pagure.issue.comment.added", - "org.fedoraproject.prod.pagure.issue.new", - "org.fedoraproject.prod.pagure.issue.edit", - "org.fedoraproject.prod.pagure.issue.comment.added", + "io.pagure.*.pagure.issue.new", + "io.pagure.*.pagure.issue.edit", + "io.pagure.*.pagure.issue.comment.added", + "io.pagure.stg.pagure.issue.new", + "io.pagure.stg.pagure.issue.edit", + "io.pagure.stg.pagure.issue.comment.added", + "io.pagure.prod.pagure.issue.new", + "io.pagure.prod.pagure.issue.edit", + "io.pagure.prod.pagure.issue.comment.added", ], ) def test_accetps_topic_valid(self, topic, toddler): diff --git a/toddlers/plugins/scm_request_processor.py b/toddlers/plugins/scm_request_processor.py index b3a777d..653f755 100644 --- a/toddlers/plugins/scm_request_processor.py +++ b/toddlers/plugins/scm_request_processor.py @@ -63,9 +63,9 @@ class SCMRequestProcessor(ToddlerBase): name: str = "scm_request_processor" amqp_topics: list = [ - "org.fedoraproject.*.pagure.issue.new", - "org.fedoraproject.*.pagure.issue.edit", - "org.fedoraproject.*.pagure.issue.comment.added", + "io.pagure.*.pagure.issue.new", + "io.pagure.*.pagure.issue.edit", + "io.pagure.*.pagure.issue.comment.added", ] # SLAs for branches @@ -113,7 +113,7 @@ class SCMRequestProcessor(ToddlerBase): :returns: True if topic is accepted, False otherwise. """ - if topic.startswith("org.fedoraproject."): + if topic.startswith("io.pagure."): if topic.endswith("pagure.issue.new"): return True if topic.endswith("pagure.issue.edit"):