Infrastructure/toddlers
1
0
Fork 0
Code Issues 10 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use correct topic for scm_request_processor

Browse source 
The Pagure messages are not sent with org.fedoraproject. prefix, but with
io.pagure. prefix.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2022-07-21 14:57:11 +02:00
parent 049403fc59
commit 506e59558c
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tests/plugins/test_scm_request_processor.py
View file

@ -31,15 +31,15 @@ class TestAcceptsTopic:
@pytest.mark.parametrize( @pytest.mark.parametrize(
"topic", "topic",
[ [
"org.fedoraproject.*.pagure.issue.new", "io.pagure.*.pagure.issue.new",
"org.fedoraproject.*.pagure.issue.edit", "io.pagure.*.pagure.issue.edit",
"org.fedoraproject.*.pagure.issue.comment.added", "io.pagure.*.pagure.issue.comment.added",
"org.fedoraproject.stg.pagure.issue.new", "io.pagure.stg.pagure.issue.new",
"org.fedoraproject.stg.pagure.issue.edit", "io.pagure.stg.pagure.issue.edit",
"org.fedoraproject.stg.pagure.issue.comment.added", "io.pagure.stg.pagure.issue.comment.added",
"org.fedoraproject.prod.pagure.issue.new", "io.pagure.prod.pagure.issue.new",
"org.fedoraproject.prod.pagure.issue.edit", "io.pagure.prod.pagure.issue.edit",
"org.fedoraproject.prod.pagure.issue.comment.added", "io.pagure.prod.pagure.issue.comment.added",
], ],
) )
def test_accetps_topic_valid(self, topic, toddler): def test_accetps_topic_valid(self, topic, toddler):

8
toddlers/plugins/scm_request_processor.py
View file

@ -63,9 +63,9 @@ class SCMRequestProcessor(ToddlerBase):
name: str = "scm_request_processor" name: str = "scm_request_processor"
amqp_topics: list = [ amqp_topics: list = [
"org.fedoraproject.*.pagure.issue.new", "io.pagure.*.pagure.issue.new",
"org.fedoraproject.*.pagure.issue.edit", "io.pagure.*.pagure.issue.edit",
"org.fedoraproject.*.pagure.issue.comment.added", "io.pagure.*.pagure.issue.comment.added",
] ]
# SLAs for branches # SLAs for branches
@ -113,7 +113,7 @@ class SCMRequestProcessor(ToddlerBase):
:returns: True if topic is accepted, False otherwise. :returns: True if topic is accepted, False otherwise.
""" """
if topic.startswith("org.fedoraproject."): if topic.startswith("io.pagure."):
if topic.endswith("pagure.issue.new"): if topic.endswith("pagure.issue.new"):
return True return True
if topic.endswith("pagure.issue.edit"): if topic.endswith("pagure.issue.edit"):