fxes

Author: Bala-Sakabattula

sync2jira/intermediary.py

@@ -215,19 +215,15 @@ def from_github(cls, upstream, pr, suffix, config, action=None):
         # Match to a JIRA
         match = matcher(pr.get("body"), comments)
 
-        _lifecycle = frozenset({"open", "merged", "closed", "reopened"})
+        lifecycle = frozenset({"open", "merged", "closed", "reopened"})
         if action:
             if action == "reopened":
                 suffix = "reopened"
             elif action == "closed":
                 suffix = "merged" if pr.get("merged") else "closed"
-            elif action == "opened":
-                suffix = "open"
             else:
                 suffix = "open"
-        elif suffix in _lifecycle:
-            pass
-        else:
+        elif suffix not in lifecycle:
             suffix = "open"
 
         # Return our PR object

sync2jira/upstream_pr.py

@@ -47,7 +47,7 @@ def handle_github_message(body, config, suffix):
     token = config["sync2jira"].get("github_token")
     github_client = Github(token, retry=5)
     reformat_github_pr(pr, upstream, github_client)
-    return i.PR.from_github(upstream, pr, suffix, config, action=body.get("action"))
+    return i.PR.from_github(upstream, pr, suffix, config, body.get("action"))
 
 
 def github_prs(upstream, config):
@@ -62,7 +62,7 @@ def github_prs(upstream, config):
     github_client = Github(config["sync2jira"]["github_token"])
     for pr in u_issue.generate_github_items("pulls", upstream, config):
         reformat_github_pr(pr, upstream, github_client)
-        yield i.PR.from_github(upstream, pr, "open", config, action=None)
+        yield i.PR.from_github(upstream, pr, "open", config)
 
 
 def reformat_github_pr(pr, upstream, github_client):

tests/test_intermediary.py

@@ -255,14 +255,13 @@ def test_from_github_pr_flat_topic_normalizes_suffix(self, mock_matcher):
         """Flat topic: suffix from webhook action (+ merged when closed); else open."""
         mock_matcher.return_value = "JIRA-1"
         flat = "github.pull_request"
-        _omit_action = object()
         cases = (
             ("closed with merge", {"merged": True}, "closed", "merged"),
             ("closed without merge", {"merged": False}, "closed", "closed"),
             ("reopened", {}, "reopened", "reopened"),
             ("opened", {}, "opened", "open"),
             ("edited maps to open", {}, "edited", "open"),
-            ("missing action", {}, _omit_action, "open"),
+            ("missing action", {}, None, "open"),
         )
         for name, pr_extra, action, expected in cases:
             with self.subTest(name):
@@ -273,7 +272,7 @@ def test_from_github_pr_flat_topic_normalizes_suffix(self, mock_matcher):
                     suffix=flat,
                     config=self.mock_config,
                 )
-                if action is not _omit_action:
+                if action is not None:
                     base_kw["action"] = action
                 response = i.PR.from_github(**base_kw)
                 self.assertEqual(response.suffix, expected)

tests/test_upstream_pr.py

@@ -122,7 +122,7 @@ def test_handle_github_message(self, mock_pr_from_github, mock_github):
             },
             "mock_suffix",
             self.mock_config,
-            action=None,
+            None,
         )
         mock_github.assert_called_with("mock_token", retry=5)
         self.assertEqual("Successful Call!", response)
@@ -201,7 +201,6 @@ def test_github_issues(
             },
             "open",
             self.mock_config,
-            action=None,
         )
         self.mock_github_client.get_repo.assert_called_with("org/repo")
         self.mock_github_repo.get_pull.assert_called_with(number="1234")