fixes

Author: Bala-Sakabattula

sync2jira/upstream_issue.py

@@ -114,7 +114,7 @@
 )
 
 
-def _github_client(config):
+def get_github_client(config):
     """
     Helper function returning headers and github_client built from config.
 
@@ -213,7 +213,7 @@ def handle_github_message(body, config, is_pr=False):
         )
         return None
 
-    headers, github_client = _github_client(config)
+    headers, github_client = get_github_client(config)
     reformat_github_issue(issue, upstream, github_client)
     add_project_values(issue, upstream, headers, config)
     return i.Issue.from_github(upstream, issue, config)
@@ -228,7 +228,7 @@ def github_issues(upstream, config):
     :returns: a generator for GitHub Issue objects
     :rtype: Generator[sync2jira.intermediary.Issue]
     """
-    headers, github_client = _github_client(config)
+    headers, github_client = get_github_client(config)
     for issue in generate_github_items("issues", upstream, config):
         if "pull_request" in issue or "/pull/" in issue.get("html_url", ""):
             # We don't want to copy these around

sync2jira/upstream_pr.py

@@ -44,7 +44,7 @@ def handle_github_message(body, config, suffix):
     pr = body["pull_request"]
     if not u_issue.passes_github_filters(pr, config, upstream, item_type="PR"):
         return None
-    headers, github_client = u_issue._github_client(config)
+    headers, github_client = u_issue.get_github_client(config)
     reformat_github_pr(pr, upstream, github_client)
     u_issue.add_project_values(pr, upstream, headers, config, "pr_updates")
     return i.PR.from_github(upstream, pr, suffix, config, body.get("action"))
@@ -59,7 +59,7 @@ def github_prs(upstream, config):
     :returns: a generator for GitHub PR objects
     :rtype: Generator[sync2jira.intermediary.PR]
     """
-    headers, github_client = u_issue._github_client(config)
+    headers, github_client = u_issue.get_github_client(config)
     for pr in u_issue.generate_github_items("pulls", upstream, config):
         reformat_github_pr(pr, upstream, github_client)
         u_issue.add_project_values(pr, upstream, headers, config, "pr_updates")

tests/test_upstream_pr.py

@@ -248,13 +248,9 @@ def test_github_prs(
                     u.github_prs(upstream="org/repo", config=self.mock_config)
                 )
 
-                self.assertEqual(len(result), expected_count, description)
-                self.assertEqual(mock_reformat.call_count, expected_count)
-                self.assertEqual(mock_add_project.call_count, expected_count)
-                self.assertEqual(mock_pr_from_github.call_count, expected_count)
+                expected = [f"PR-{pr['number']}" for pr in raw_items]
+                self.assertEqual(result, expected, description)
 
-                mock_reformat.reset_mock()
-                mock_add_project.reset_mock()
                 mock_pr_from_github.reset_mock()
 
     @mock.patch("sync2jira.intermediary.PR.from_github")