fix tests

Author: wedamija

tests/sentry/integrations/github/tasks/test_sync_repos_on_install_change.py

@@ -13,6 +13,7 @@
 from sentry.testutils.silo import assume_test_silo_mode, assume_test_silo_mode_of, control_silo_test
 
 FEATURE_FLAG = "organizations:github-repo-auto-sync-webhook"
+REMOVAL_FLAG = "organizations:scm-repo-auto-sync-removal"
 
 
 @control_silo_test
@@ -70,7 +71,7 @@ def test_repos_removed(self, _: MagicMock) -> None:
                 status=ObjectStatus.ACTIVE,
             )
 
-        with self.feature(FEATURE_FLAG):
+        with self.feature([FEATURE_FLAG, REMOVAL_FLAG]):
             sync_repos_on_install_change(
                 integration_id=self.integration.id,
                 action="removed",
@@ -100,7 +101,7 @@ def test_mixed_add_and_remove(self, _: MagicMock) -> None:
                 status=ObjectStatus.ACTIVE,
             )
 
-        with self.feature(FEATURE_FLAG):
+        with self.feature([FEATURE_FLAG, REMOVAL_FLAG]):
             sync_repos_on_install_change(
                 integration_id=self.integration.id,
                 action="added",

tests/sentry/integrations/github/test_webhook.py

@@ -435,7 +435,15 @@ def test_end_to_end_repos_added(self) -> None:
         )
         sha1, sha256 = self._compute_signatures(body)
 
-        with self.feature("organizations:github-repo-auto-sync-webhook"), self.tasks():
+        with (
+            self.feature(
+                [
+                    "organizations:github-repo-auto-sync-webhook",
+                    "organizations:scm-repo-auto-sync-removal",
+                ]
+            ),
+            self.tasks(),
+        ):
             response = self.client.post(
                 path=self.url,
                 data=body,
@@ -483,7 +491,15 @@ def test_end_to_end_repos_removed(self, mock_seer_cleanup: MagicMock) -> None:
         )
         sha1, sha256 = self._compute_signatures(body)
 
-        with self.feature("organizations:github-repo-auto-sync-webhook"), self.tasks():
+        with (
+            self.feature(
+                [
+                    "organizations:github-repo-auto-sync-webhook",
+                    "organizations:scm-repo-auto-sync-removal",
+                ]
+            ),
+            self.tasks(),
+        ):
             response = self.client.post(
                 path=self.url,
                 data=body,

tests/sentry/integrations/source_code_management/test_sync_repos.py

@@ -85,7 +85,11 @@ def test_disables_removed_repos(self, _: MagicMock) -> None:
         self._add_repos_response([{"id": 1, "full_name": "getsentry/sentry", "name": "sentry"}])
 
         with self.feature(
-            ["organizations:github-repo-auto-sync", "organizations:github-repo-auto-sync-apply"]
+            [
+                "organizations:github-repo-auto-sync",
+                "organizations:github-repo-auto-sync-apply",
+                "organizations:scm-repo-auto-sync-removal",
+            ]
         ):
             sync_repos_for_org(self.oi.id)