test(hybrid-cloud): Stabilizes sentry app install tests (#53004)

Author: GabeVillalobos

src/sentry/models/organizationmember.py

@@ -251,7 +251,7 @@ class Meta:
     __org_roles_from_teams = None
 
     def delete(self, *args, **kwds):
-        with outbox_context(transaction.atomic()):
+        with outbox_context(transaction.atomic(using=router.db_for_write(OrganizationMember))):
             self.save_outbox_for_update()
             return super().delete(*args, **kwds)
 
@@ -587,7 +587,7 @@ def approve_member_invitation(
         from sentry import audit_log
         from sentry.utils.audit import create_audit_entry_from_user
 
-        with transaction.atomic():
+        with transaction.atomic(using=router.db_for_write(OrganizationMember)):
             self.approve_invite()
             self.save()
 

src/sentry/models/user.py

@@ -5,7 +5,7 @@
 from django.contrib.auth.models import AbstractBaseUser
 from django.contrib.auth.models import UserManager as DjangoUserManager
 from django.contrib.auth.signals import user_logged_out
-from django.db import IntegrityError, models, transaction
+from django.db import IntegrityError, models, router, transaction
 from django.db.models import Count, Subquery
 from django.db.models.query import QuerySet
 from django.dispatch import receiver
@@ -162,7 +162,7 @@ def class_name(self):
     def delete(self):
         if self.username == "sentry":
             raise Exception('You cannot delete the "sentry" user as it is required by Sentry.')
-        with outbox_context(transaction.atomic(), flush=False):
+        with outbox_context(transaction.atomic(using=router.db_for_write(User)), flush=False):
             avatar = self.avatar.first()
             if avatar:
                 avatar.delete()
@@ -171,13 +171,13 @@ def delete(self):
             return super().delete()
 
     def update(self, *args, **kwds):
-        with outbox_context(transaction.atomic(), flush=False):
+        with outbox_context(transaction.atomic(using=router.db_for_write(User)), flush=False):
             for outbox in self.outboxes_for_update():
                 outbox.save()
             return super().update(*args, **kwds)
 
     def save(self, *args, **kwargs):
-        with outbox_context(transaction.atomic(), flush=False):
+        with outbox_context(transaction.atomic(using=router.db_for_write(User)), flush=False):
             if not self.username:
                 self.username = self.email
             result = super().save(*args, **kwargs)
@@ -323,7 +323,7 @@ def merge_to(from_user, to_user):
         for model in model_list:
             for obj in model.objects.filter(user_id=from_user.id):
                 try:
-                    with transaction.atomic():
+                    with transaction.atomic(using=router.db_for_write(User)):
                         obj.update(user_id=to_user.id)
                 except IntegrityError:
                     pass

src/sentry/services/hybrid_cloud/organization/impl.py

@@ -2,7 +2,7 @@
 
 from typing import Any, Iterable, List, Mapping, Optional, Set, Union, cast
 
-from django.db import IntegrityError, models, transaction
+from django.db import IntegrityError, models, router, transaction
 from django.dispatch import Signal
 
 from sentry import roles
@@ -491,7 +491,7 @@ def update_region_user(self, *, user: RpcRegionUser, region_name: str) -> None:
         # Normally, calling update on a QS for organization member fails because we need to ensure that updates to
         # OrganizationMember objects produces outboxes.  In this case, it is safe to do the update directly because
         # the attribute we are changing never needs to produce an outbox.
-        with unguarded_write():
+        with unguarded_write(using=router.db_for_write(OrganizationMember)):
             OrganizationMember.objects.filter(user_id=user.id).update(
                 user_is_active=user.is_active, user_email=user.email
             )

tests/sentry/api/endpoints/test_organization_sentry_app_installation_details.py

@@ -56,7 +56,7 @@ def setUp(self):
         )
 
 
-@control_silo_test()
+@control_silo_test(stable=True)
 class GetSentryAppInstallationDetailsTest(SentryAppInstallationDetailsTest):
     def test_access_within_installs_organization(self):
         self.login_as(user=self.user)

tests/sentry/deletions/test_sentry_app_installations.py

@@ -16,7 +16,7 @@
 from sentry.testutils.outbox import outbox_runner
 
 
-class TestSentryAppIntallationDeletionTask(TestCase):
+class TestSentryAppInstallationDeletionTask(TestCase):
     def setUp(self):
         self.user = self.create_user()
         self.org = self.create_organization()