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

Fix unit tests

Browse source 
Signed-off-by: Michal Konečný <mkonecny@redhat.com>
This commit is contained in:
Michal Konečný 2022-03-24 17:57:29 +01:00
parent 6a53ce23a0
commit 5d0d0490d2
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/plugins/test_scm_request_processor.py
View file

@ -86,7 +86,7 @@ class TestProcess:
msg = IssueNewV1() msg = IssueNewV1()
msg.body = { msg.body = {
"project": {"fullname": scm_request_processor.PROJECT_NAMESPACE}, "project": {"fullname": scm_request_processor.PROJECT_NAMESPACE},
"issue": {"id": 100, "close_status": "Closed"}, "issue": {"id": 100, "status": "Closed"},
} }
with patch( with patch(
@ -110,7 +110,7 @@ class TestProcess:
initial processing. initial processing.
""" """
msg = IssueNewV1() msg = IssueNewV1()
issue = {"id": 100, "close_status": "Open"} issue = {"id": 100, "status": "Open"}
msg.body = { msg.body = {
"project": {"fullname": scm_request_processor.PROJECT_NAMESPACE}, "project": {"fullname": scm_request_processor.PROJECT_NAMESPACE},
"issue": issue, "issue": issue,
@ -2792,4 +2792,5 @@ class TestMain:
) )
message = IssueNewV1() message = IssueNewV1()
message.body["issue"] = mock_issue message.body["issue"] = mock_issue
message.body["project"] = {"fullname": scm_request_processor.PROJECT_NAMESPACE}
mock_process.assert_called_with(config={}, message=message) mock_process.assert_called_with(config={}, message=message)

4
tests/utils/test_pagure.py
View file

@ -244,7 +244,7 @@ class TestPagureAddCommentToIssue:
self.pagure.add_comment_to_issue(issue_id, namespace, message) self.pagure.add_comment_to_issue(issue_id, namespace, message)
self.pagure._requests_session.post.assert_called_with( self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/test/issue/100/comment", "https://pagure.io/api/0/test/issue/100/comment",
data={"comment": message}, data={"comment": message},
headers=self.pagure.get_auth_header(), headers=self.pagure.get_auth_header(),
) )
@ -268,7 +268,7 @@ class TestPagureAddCommentToIssue:
self.pagure.add_comment_to_issue(issue_id, namespace, message) self.pagure.add_comment_to_issue(issue_id, namespace, message)
self.pagure._requests_session.post.assert_called_with( self.pagure._requests_session.post.assert_called_with(
"https://pagure.io/test/issue/100/comment", "https://pagure.io/api/0/test/issue/100/comment",
data={"comment": message}, data={"comment": message},
headers=self.pagure.get_auth_header(), headers=self.pagure.get_auth_header(),
) )

4
toddlers/plugins/scm_request_processor.py
View file

@ -1058,9 +1058,7 @@ def main(args):
# Convert issue to message # Convert issue to message
message = IssueNewV1() message = IssueNewV1()
message.body["issue"] = issue message.body["issue"] = issue
message.body["project"] = { message.body["project"] = {"fullname": PROJECT_NAMESPACE}
"fullname": PROJECT_NAMESPACE
}
_log.debug("Message prepared: {}".format(message.body)) _log.debug("Message prepared: {}".format(message.body))
SCMRequestProcessor().process( SCMRequestProcessor().process(

6
toddlers/utils/pagure.py
View file

@ -176,8 +176,10 @@ class Pagure:
Raises: Raises:
toddlers.utils.exceptions.PagureError: When the issue couldn't be commented on. toddlers.utils.exceptions.PagureError: When the issue couldn't be commented on.
""" """
issue_url = "{0}/api/0/{1}/issue/{2}".format(self._pagure_url, namespace, issue_id) issue_url = "{0}/{1}/issue/{2}".format(self._pagure_url, namespace, issue_id)
api_url = "{0}/comment".format(issue_url) api_url = "{0}/api/0/{1}/issue/{2}/comment".format(
self._pagure_url, namespace, issue_id
)
comment_payload = {"comment": comment} comment_payload = {"comment": comment}
headers = self.get_auth_header() headers = self.get_auth_header()