From 0b0056131ce6bfcfe3b8ab99baecda77accd61a0 Mon Sep 17 00:00:00 2001 From: anthony sottile Date: Tue, 23 Jul 2024 15:30:14 -0400 Subject: [PATCH] ref: prevent clobbering create_integration in base class --- tests/sentry/integrations/github/test_search.py | 4 ++-- .../integrations/github_enterprise/test_search.py | 2 +- .../sentry/integrations/opsgenie/test_notify_action.py | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/sentry/integrations/github/test_search.py b/tests/sentry/integrations/github/test_search.py index 5bac78bcae541b..90cb9f723af437 100644 --- a/tests/sentry/integrations/github/test_search.py +++ b/tests/sentry/integrations/github/test_search.py @@ -16,7 +16,7 @@ class GithubSearchTest(APITestCase): provider = "github" base_url = "https://api.github.com" - def create_integration(self): + def _create_integration(self): future = datetime.now() + timedelta(hours=1) return self.create_provider_integration( provider=self.provider, @@ -32,7 +32,7 @@ def create_integration(self): def setUp(self): super().setUp() - self.integration = self.create_integration() + self.integration = self._create_integration() identity = Identity.objects.create( idp=self.create_identity_provider(type=self.provider), user=self.user, diff --git a/tests/sentry/integrations/github_enterprise/test_search.py b/tests/sentry/integrations/github_enterprise/test_search.py index 09fe6957db99c7..7ff1b386ccd123 100644 --- a/tests/sentry/integrations/github_enterprise/test_search.py +++ b/tests/sentry/integrations/github_enterprise/test_search.py @@ -12,7 +12,7 @@ class GithubEnterpriseSearchTest(test_search.GithubSearchTest): provider = "github_enterprise" base_url = "https://github.example.org/api/v3" - def create_integration(self): + def _create_integration(self): future = datetime.now() + timedelta(hours=1) return self.create_provider_integration( provider=self.provider, diff --git a/tests/sentry/integrations/opsgenie/test_notify_action.py b/tests/sentry/integrations/opsgenie/test_notify_action.py index 8fe3f9647b7726..a2471c12142d1e 100644 --- a/tests/sentry/integrations/opsgenie/test_notify_action.py +++ b/tests/sentry/integrations/opsgenie/test_notify_action.py @@ -24,7 +24,7 @@ class OpsgenieNotifyTeamTest(RuleTestCase, PerformanceIssueTestCase): rule_cls = OpsgenieNotifyTeamAction - def create_integration(self, name): + def _create_integration(self, name): integration = self.create_provider_integration( provider="opsgenie", name=name, external_id=name, metadata=METADATA ) @@ -34,7 +34,7 @@ def create_integration(self, name): def setUp(self): self.team1 = {"id": "123-id", "team": "cool-team", "integration_key": "1234-5678"} with assume_test_silo_mode(SiloMode.CONTROL): - self.integration = self.create_integration(name="test-app") + self.integration = self._create_integration(name="test-app") with assume_test_silo_mode(SiloMode.CONTROL): self.org_integration = OrganizationIntegration.objects.get( organization_id=self.organization.id, integration_id=self.integration.id @@ -170,7 +170,7 @@ def test_invalid_int_id(self): def test_notifies_with_multiple_og_accounts(self): team2 = {"id": "456-id", "team": "cooler-team", "integration_key": "1234-7890"} with assume_test_silo_mode(SiloMode.CONTROL): - integration = self.create_integration("test-app-2") + integration = self._create_integration("test-app-2") org_integration = OrganizationIntegration.objects.get( organization_id=self.organization.id, integration_id=integration.id ) @@ -213,7 +213,7 @@ def test_notifies_with_multiple_og_accounts(self): def test_invalid_team_selected(self): team2 = {"id": "456-id", "team": "cooler-team", "integration_key": "1234-7890"} with assume_test_silo_mode(SiloMode.CONTROL): - integration = self.create_integration("test-app-2") + integration = self._create_integration("test-app-2") org_integration = OrganizationIntegration.objects.get( organization_id=self.organization.id, integration_id=integration.id ) @@ -248,7 +248,7 @@ def test_bad_integration_key(self): def test_team_deleted(self, mock_logger: MagicMock): team2 = {"id": "456-id", "team": "cooler-team", "integration_key": "1234-7890"} with assume_test_silo_mode(SiloMode.CONTROL): - integration = self.create_integration("test-app-2") + integration = self._create_integration("test-app-2") org_integration = OrganizationIntegration.objects.get( organization_id=self.organization.id, integration_id=integration.id )