tests(resolve_groups): Clean up the tests

tests/sentry/integrations/github/test_webhooks.py

@@ -240,7 +240,7 @@ def setUp(self):
         self.secret = "b3002c3e321d4b7880360d397db2ccfd"
         options.set("github-app.webhook-secret", self.secret)
 
-    def _setup_repo_test(self, project):
+    def _create_integration_and_send_push_event(self):
         future_expires = datetime.now().replace(microsecond=0) + timedelta(minutes=5)
         with assume_test_silo_mode(SiloMode.CONTROL):
             integration = self.create_integration(
@@ -305,7 +305,7 @@ def test_simple(self, mock_record):
             name="baxterthehacker/repo",
         )
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_push_event()
 
         commit_list = list(
             Commit.objects.filter(
@@ -349,7 +349,7 @@ def test_simple(self, mock_record):
     @responses.activate
     @patch("sentry.integrations.github.webhook.metrics")
     def test_creates_missing_repo(self, mock_metrics):
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_push_event()
 
         repos = Repository.objects.all()
         assert len(repos) == 1
@@ -369,7 +369,7 @@ def test_ignores_hidden_repo(self):
         repo.external_id = "35129377"
         repo.save()
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_push_event()
 
         repos = Repository.objects.all()
         assert len(repos) == 1
@@ -391,7 +391,7 @@ def test_anonymous_lookup(self):
             name="bàxterthehacker",
         )
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_push_event()
 
         commit_list = list(
             Commit.objects.filter(organization_id=self.project.organization.id)
@@ -576,7 +576,7 @@ def setUp(self):
         self.secret = "b3002c3e321d4b7880360d397db2ccfd"
         options.set("github-app.webhook-secret", self.secret)
 
-    def _setup_repo_test(self, project):
+    def _create_integration_and_send_pull_request_opened_event(self):
         future_expires = datetime.now().replace(microsecond=0) + timedelta(minutes=5)
         with assume_test_silo_mode(SiloMode.CONTROL):
             integration = self.create_integration(
@@ -643,7 +643,7 @@ def test_opened(self, mock_record, mock_metrics, mock_open_pr_comment_workflow_d
             name="baxterthehacker/public-repo",
         )
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_pull_request_opened_event()
 
         prs = PullRequest.objects.filter(
             repository_id=repo.id, organization_id=self.project.organization.id
@@ -685,14 +685,14 @@ def test_opened_missing_option(self, mock_metrics):
             organization=self.organization, key="sentry:github_open_pr_bot", value=False
         )
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_pull_request_opened_event()
 
         assert mock_metrics.incr.call_count == 0
 
     @patch("sentry.integrations.github.webhook.metrics")
     def test_creates_missing_repo(self, mock_metrics):
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_pull_request_opened_event()
 
         repos = Repository.objects.all()
         assert len(repos) == 1
@@ -713,7 +713,7 @@ def test_ignores_hidden_repo(self):
         repo.external_id = "35129377"
         repo.save()
 
-        self._setup_repo_test(self.project)
+        self._create_integration_and_send_pull_request_opened_event()
 
         repos = Repository.objects.all()
         assert len(repos) == 1

tests/sentry/models/test_pullrequest.py

@@ -2,42 +2,70 @@
 from uuid import uuid4
 
 from sentry.models.commit import Commit
+from sentry.models.group import GroupStatus
 from sentry.models.grouphistory import GroupHistory, GroupHistoryStatus
+from sentry.models.grouplink import GroupLink
 from sentry.models.pullrequest import PullRequest
 from sentry.models.repository import Repository
 from sentry.testutils.cases import TestCase
 
 
 class FindReferencedGroupsTest(TestCase):
-    def test_multiple_matches_basic(self):
+    def test_resolve_in_commit(self) -> None:
         group = self.create_group()
-        group2 = self.create_group()
 
-        repo = Repository.objects.create(name="example", organization_id=self.group.organization.id)
+        repo = Repository.objects.create(name="example", organization_id=group.organization.id)
 
         commit = Commit.objects.create(
             key=sha1(uuid4().hex.encode("utf-8")).hexdigest(),
             repository_id=repo.id,
             organization_id=group.organization.id,
+            # It makes reference to the first group
             message=f"Foo Biz\n\nFixes {group.qualified_short_id}",
         )
 
         groups = commit.find_referenced_groups()
         assert len(groups) == 1
         assert group in groups
+        # These are created in resolved_in_commit
+        assert GroupHistory.objects.filter(
+            group=group,
+            status=GroupHistoryStatus.SET_RESOLVED_IN_COMMIT,
+        ).exists()
+        assert GroupLink.objects.filter(
+            group=group,
+            linked_type=GroupLink.LinkedType.commit,
+            linked_id=commit.id,
+        ).exists()
+        group.refresh_from_db()
+        assert group.status == GroupStatus.RESOLVED
+
+    def test_resolve_in_pull_request(self) -> None:
+        group = self.create_group()
+        repo = Repository.objects.create(name="example", organization_id=group.organization.id)
 
         pr = PullRequest.objects.create(
             key="1",
             repository_id=repo.id,
             organization_id=group.organization.id,
             title="very cool PR to fix the thing",
-            message=f"Foo Biz\n\nFixes {group2.qualified_short_id}",
+            # It makes reference to the second group
+            message=f"Foo Biz\n\nFixes {group.qualified_short_id}",
         )
 
         groups = pr.find_referenced_groups()
         assert len(groups) == 1
-        assert group2 in groups
+        assert group in groups
+        # These are created in resolved_in_pull_request
         assert GroupHistory.objects.filter(
-            group=group2,
+            group=group,
             status=GroupHistoryStatus.SET_RESOLVED_IN_PULL_REQUEST,
-        )
+        ).exists()
+        assert GroupLink.objects.filter(
+            group=group,
+            linked_type=GroupLink.LinkedType.pull_request,
+            linked_id=pr.id,
+        ).exists()
+        # XXX: Oddly,resolved_in_pull_request doesn't update the group status
+        group.refresh_from_db()
+        assert group.status == GroupStatus.UNRESOLVED