test(hc): Clean up clear_global_regions uses (#61470)

Author: RyanSkonnord

tests/sentry/api/test_base.py

@@ -15,9 +15,8 @@
 from sentry.silo import SiloMode
 from sentry.testutils.cases import APITestCase
 from sentry.testutils.helpers.options import override_options
-from sentry.testutils.region import override_region_config
-from sentry.testutils.silo import all_silo_test, assume_test_silo_mode
-from sentry.types.region import RegionCategory, clear_global_regions, subdomain_is_region
+from sentry.testutils.silo import all_silo_test, assume_test_silo_mode, create_test_regions
+from sentry.types.region import subdomain_is_region
 from sentry.utils.cursors import Cursor
 
 
@@ -500,33 +499,17 @@ def test_non_json_content_type(self):
         assert not self.request.json_body
 
 
+@all_silo_test(regions=create_test_regions("us", "eu"))
 class CustomerDomainTest(APITestCase):
     def test_resolve_region(self):
-        clear_global_regions()
-
         def request_with_subdomain(subdomain):
             request = self.make_request(method="GET")
             request.subdomain = subdomain
             return subdomain_is_region(request)
 
-        region_config = [
-            {
-                "name": "us",
-                "snowflake_id": 1,
-                "address": "http://us.testserver",
-                "category": RegionCategory.MULTI_TENANT.name,
-            },
-            {
-                "name": "eu",
-                "snowflake_id": 1,
-                "address": "http://eu.testserver",
-                "category": RegionCategory.MULTI_TENANT.name,
-            },
-        ]
-        with override_region_config(region_config):
-            assert request_with_subdomain("us")
-            assert request_with_subdomain("eu")
-            assert not request_with_subdomain("sentry")
+        assert request_with_subdomain("us")
+        assert request_with_subdomain("eu")
+        assert not request_with_subdomain("sentry")
 
 
 class EndpointSiloLimitTest(APITestCase):

tests/sentry/middleware/test_customer_domain.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from typing import Any
 from unittest import mock
 
 from django.conf import settings
@@ -15,9 +14,7 @@
 from sentry.middleware.customer_domain import CustomerDomainMiddleware
 from sentry.testutils.cases import APITestCase, TestCase
 from sentry.testutils.helpers import with_feature
-from sentry.testutils.region import override_region_config
-from sentry.testutils.silo import no_silo_test
-from sentry.types.region import RegionCategory, clear_global_regions
+from sentry.testutils.silo import all_silo_test, create_test_regions, no_silo_test
 from sentry.web.frontend.auth_logout import AuthLogoutView
 
 
@@ -27,9 +24,8 @@ def _session(d: dict[str, str]) -> SessionBase:
     return ret
 
 
-@override_settings(
-    SENTRY_USE_CUSTOMER_DOMAINS=True,
-)
+@all_silo_test(regions=create_test_regions("us", "eu"))
+@override_settings(SENTRY_USE_CUSTOMER_DOMAINS=True)
 class CustomerDomainMiddlewareTest(TestCase):
     def test_sets_active_organization_if_exists(self):
         self.create_organization(name="test")
@@ -128,30 +124,14 @@ def test_no_op(self):
         assert response == mock.sentinel.response
 
     def test_ignores_region_subdomains(self):
-        clear_global_regions()
-        region_configs: list[dict[str, Any]] = [
-            {
-                "name": "us",
-                "snowflake_id": 1,
-                "address": "http://us.testserver",
-                "category": RegionCategory.MULTI_TENANT.name,
-            },
-            {
-                "name": "eu",
-                "snowflake_id": 1,
-                "address": "http://eu.testserver",
-                "category": RegionCategory.MULTI_TENANT.name,
-            },
-        ]
-        with override_region_config(region_configs):
-            for region in region_configs:
-                request = RequestFactory().get("/")
-                request.subdomain = region["name"]
-                request.session = _session({"activeorg": "test"})
-                response = CustomerDomainMiddleware(lambda request: mock.sentinel.response)(request)
-
-                assert dict(request.session) == {"activeorg": "test"}
-                assert response == mock.sentinel.response
+        for region_name in ("us", "eu"):
+            request = RequestFactory().get("/")
+            request.subdomain = region_name
+            request.session = _session({"activeorg": "test"})
+            response = CustomerDomainMiddleware(lambda request: mock.sentinel.response)(request)
+
+            assert dict(request.session) == {"activeorg": "test"}
+            assert response == mock.sentinel.response
 
     def test_handles_redirects(self):
         self.create_organization(name="sentry")