Merge remote-tracking branches 'origin/fix/flaky-test-code-mappings-invalid-integration-id', 'origin/fix/flaky-test-disable-alerts-multiple-scopes', 'origin/fix/flaky-test-error-handled-alias-data-leak', 'origin/fix/flaky-test-link-all-repos-ordering' and 'origin/fix/flaky-test-project-user-stats-snuba-leak' into shuffle-tests-across-shards

Author: joshuarli

tests/sentry/api/endpoints/test_project_user_stats.py

@@ -1,13 +1,13 @@
 from django.urls import reverse
 
-from sentry.testutils.cases import APITestCase
+from sentry.testutils.cases import APITestCase, SnubaTestCase
 from sentry.testutils.helpers.datetime import before_now, freeze_time
 from sentry.testutils.skips import requires_snuba
 
 pytestmark = [requires_snuba]
 
 
-class ProjectUserDetailsTest(APITestCase):
+class ProjectUserDetailsTest(APITestCase, SnubaTestCase):
     def setUp(self) -> None:
         super().setUp()
         self.user = self.create_user()

tests/sentry/integrations/api/endpoints/test_organization_code_mappings.py

@@ -190,13 +190,13 @@ def test_basic_get_with_no_integrationId_and_projectId(self) -> None:
         assert len(response.data) == 2
 
     def test_basic_get_with_invalid_integrationId(self) -> None:
-        url_path = f"{self.url}?integrationId=100"
+        url_path = f"{self.url}?integrationId=999999999"
         response = self.client.get(url_path, format="json")
 
         assert response.status_code == 404, response.content
 
     def test_basic_get_with_invalid_projectId(self) -> None:
-        url_path = f"{self.url}?project=100"
+        url_path = f"{self.url}?project=999999999"
         response = self.client.get(url_path, format="json")
 
         assert response.status_code == 403, response.content
@@ -270,7 +270,7 @@ def test_basic_post_from_non_member_permissions(self) -> None:
         assert response.status_code == 403, response.content
 
     def test_basic_post_with_invalid_integrationId(self) -> None:
-        response = self.make_post({"integrationId": 100})
+        response = self.make_post({"integrationId": 999999999})
         assert response.status_code == 404, response.content
 
     def test_basic_post_with_no_integrationId(self) -> None:

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

@@ -71,7 +71,7 @@ def test_link_all_repos(self, mock_record: MagicMock, _: MagicMock) -> None:
         )
 
         with assume_test_silo_mode(SiloMode.REGION):
-            repos = Repository.objects.all()
+            repos = Repository.objects.all().order_by("name")
         assert len(repos) == 2
 
         for repo in repos:

tests/sentry/notifications/utils/test_participants.py

@@ -259,7 +259,10 @@ def setUp(self) -> None:
 
         user_ids = list(self.project.member_set.values_list("user_id", flat=True))
         with assume_test_silo_mode(SiloMode.CONTROL):
-            users = [Owner("user", user.email) for user in User.objects.filter(id__in=user_ids)]
+            users = [
+                Owner("user", user.email)
+                for user in User.objects.filter(id__in=user_ids).order_by("id")
+            ]
         ProjectOwnership.objects.create(
             project_id=self.project.id,
             schema=dump_schema(

tests/sentry/snuba/test_errors.py

@@ -799,7 +799,9 @@ def test_epm(self) -> None:
                 assert data[0]["tpm_60"] == 6
 
     def test_error_handled_alias(self) -> None:
-        data = load_data("android-ndk", timestamp=before_now(minutes=10))
+        project = self.create_project(organization=self.organization)
+        event_time = before_now(minutes=10)
+        data = load_data("android-ndk", timestamp=event_time)
         events = (
             ("a" * 32, "not handled", False),
             ("b" * 32, "is handled", True),
@@ -810,7 +812,7 @@ def test_error_handled_alias(self) -> None:
             data["logentry"] = {"formatted": event[1]}
             data["exception"]["values"][0]["value"] = event[1]
             data["exception"]["values"][0]["mechanism"]["handled"] = event[2]
-            self.store_event(data=data, project_id=self.project.id)
+            self.store_event(data=data, project_id=project.id)
 
         queries: list[tuple[str, list[int]]] = [
             ("", [0, 1, 1]),
@@ -828,9 +830,9 @@ def test_error_handled_alias(self) -> None:
                 query=query,
                 snuba_params=SnubaParams(
                     organization=self.organization,
-                    projects=[self.project],
-                    start=before_now(minutes=12),
-                    end=before_now(minutes=8),
+                    projects=[project],
+                    start=event_time - timedelta(minutes=2),
+                    end=event_time + timedelta(minutes=2),
                 ),
                 referrer="errors",
             )