From c4fa8a526b4f0d1550968c9fa163ac6292dcfb2a Mon Sep 17 00:00:00 2001 From: Jay Greguske Date: Wed, 2 Oct 2024 11:11:14 -0400 Subject: [PATCH] code consistency and other non-functional clean up Co-authored-by: Webb Scales --- sync2jira/upstream_issue.py | 2 +- sync2jira/upstream_pr.py | 2 -- tests/test_upstream_issue.py | 6 +++--- tests/test_upstream_pr.py | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sync2jira/upstream_issue.py b/sync2jira/upstream_issue.py index 8ef62be..ec77397 100644 --- a/sync2jira/upstream_issue.py +++ b/sync2jira/upstream_issue.py @@ -64,8 +64,8 @@ def handle_github_message(msg, config, pr_filter=True): owner = msg['msg']['repository']['owner']['login'] repo = msg['msg']['repository']['name'] upstream = '{owner}/{repo}'.format(owner=owner, repo=repo) - mapped_repos = config['sync2jira']['map']['github'] + mapped_repos = config['sync2jira']['map']['github'] if upstream not in mapped_repos: log.debug("%r not in Github map: %r", upstream, mapped_repos.keys()) return None diff --git a/sync2jira/upstream_pr.py b/sync2jira/upstream_pr.py index d18bc9a..e329286 100644 --- a/sync2jira/upstream_pr.py +++ b/sync2jira/upstream_pr.py @@ -46,12 +46,10 @@ def handle_github_message(msg, config, suffix): :returns: Issue object :rtype: sync2jira.intermediary.PR """ - # Create our title (i.e. owner/repo) owner = msg['msg']['repository']['owner']['login'] repo = msg['msg']['repository']['name'] upstream = '{owner}/{repo}'.format(owner=owner, repo=repo) - # Check if upstream is in mapped repos mapped_repos = config['sync2jira']['map']['github'] if upstream not in mapped_repos: log.debug("%r not in Github map: %r", upstream, mapped_repos.keys()) diff --git a/tests/test_upstream_issue.py b/tests/test_upstream_issue.py index fb2aada..d242d9f 100644 --- a/tests/test_upstream_issue.py +++ b/tests/test_upstream_issue.py @@ -81,15 +81,15 @@ def setUp(self): } } - # Mock Github Reporter + # Mock GitHub Reporter self.mock_github_person = MagicMock() self.mock_github_person.name = 'mock_name' - # Mock Github Repo + # Mock GitHub Repo self.mock_github_repo = MagicMock() self.mock_github_repo.get_issue.return_value = self.mock_github_issue - # Mock Github Client + # Mock GitHub Client self.mock_github_client = MagicMock() self.mock_github_client.get_repo.return_value = self.mock_github_repo self.mock_github_client.get_user.return_value = self.mock_github_person diff --git a/tests/test_upstream_pr.py b/tests/test_upstream_pr.py index d65693d..09ecf11 100644 --- a/tests/test_upstream_pr.py +++ b/tests/test_upstream_pr.py @@ -81,16 +81,16 @@ def setUp(self): } } - # Mock Github Reporter + # Mock GitHub Reporter self.mock_github_person = MagicMock() self.mock_github_person.name = 'mock_name' - # Mock Github Repo + # Mock GitHub Repo self.mock_github_repo = MagicMock() self.mock_github_repo.get_pull.return_value = self.mock_github_pr self.mock_github_repo.get_issue.return_value = self.mock_github_pr - # Mock Github Client + # Mock GitHub Client self.mock_github_client = MagicMock() self.mock_github_client.get_repo.return_value = self.mock_github_repo self.mock_github_client.get_user.return_value = self.mock_github_person