Browse Source

ref: SERVER_NAME= -> HTTP_HOST= (#79290)

the underlying django bug was fixed \o/

<!-- Describe your PR here. -->
anthony sottile 4 months ago
parent
commit
03f632c668

+ 1 - 1
tests/integration/test_api.py

@@ -99,7 +99,7 @@ class AuthenticationTest(AuthProviderTestCase):
         resp = self.client.get(
             f"/api/0/teams/{self.organization.slug}/{self.team.slug}/",
             HTTP_REFERER=f"https://testdomain.com/organizations/{self.organization.slug}/teams",
-            SERVER_NAME="testdomain.com",
+            HTTP_HOST="testdomain.com",
         )
 
         assert (

+ 5 - 9
tests/sentry/middleware/test_customer_domain.py

@@ -377,9 +377,7 @@ class End2EndTest(APITestCase):
             response = self.client.get(
                 reverse("org-events-endpoint", kwargs={"organization_id_or_slug": "some-org"}),
                 data={"querystring": "value"},
-                # This should preferably be HTTP_HOST.
-                # Using SERVER_NAME until https://code.djangoproject.com/ticket/32106 is fixed.
-                SERVER_NAME="does-not-exist.testserver",
+                HTTP_HOST="does-not-exist.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -448,9 +446,7 @@ class End2EndTest(APITestCase):
                     "org-events-endpoint", kwargs={"organization_id_or_slug": "albertos-apples"}
                 ),
                 data={"querystring": "value"},
-                # This should preferably be HTTP_HOST.
-                # Using SERVER_NAME until https://code.djangoproject.com/ticket/32106 is fixed.
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -469,7 +465,7 @@ class End2EndTest(APITestCase):
                     "org-events-endpoint", kwargs={"organization_id_or_slug": "albertos-apples"}
                 ),
                 data={"querystring": "value"},
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
             )
             assert response.status_code == 200
 
@@ -479,7 +475,7 @@ class End2EndTest(APITestCase):
                     "org-events-endpoint", kwargs={"organization_id_or_slug": "albertos-apples"}
                 ),
                 data={"querystring": "value"},
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
             )
             assert response.status_code == 405
 
@@ -584,7 +580,7 @@ class End2EndTest(APITestCase):
         ):
             response = self.client.get(
                 "/api/0/some-org/",
-                SERVER_NAME="banned.testserver",
+                HTTP_HOST="banned.testserver",
                 follow=True,
             )
             assert response.status_code == 200

+ 1 - 1
tests/sentry/middleware/test_subdomain.py

@@ -112,7 +112,7 @@ class End2EndTest(APITestCase):
 
         response = self.client.get(
             reverse("test-endpoint"),
-            SERVER_NAME="albertos_apples.testserver",
+            HTTP_HOST="albertos_apples.testserver",
         )
         assert isinstance(response, HttpResponseRedirect)
         assert response.status_code == 302

+ 1 - 1
tests/sentry/users/api/endpoints/test_auth_index.py

@@ -287,7 +287,7 @@ class AuthVerifyEndpointSuperuserTest(AuthProviderTestCase, APITestCase):
                     "superuserAccessCategory": "for_unit_test",
                     "superuserReason": "for testing",
                 },
-                SERVER_NAME=f"{other_org.slug}.testserver",
+                HTTP_HOST=f"{other_org.slug}.testserver",
                 HTTP_REFERER=referrer,
             )
             # status code of 401 means invalid SSO session

+ 8 - 12
tests/sentry/web/frontend/test_auth_login.py

@@ -561,7 +561,7 @@ class AuthLoginCustomerDomainTest(TestCase):
             resp = self.client.post(
                 self.path,
                 {"username": self.user.username, "password": "admin", "op": "login"},
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
 
@@ -599,9 +599,7 @@ class AuthLoginCustomerDomainTest(TestCase):
             resp = self.client.post(
                 self.path,
                 {"username": self.user.username, "password": "admin", "op": "login"},
-                # This should preferably be HTTP_HOST.
-                # Using SERVER_NAME until https://code.djangoproject.com/ticket/32106 is fixed.
-                SERVER_NAME="invalid.testserver",
+                HTTP_POST="invalid.testserver",
                 follow=True,
             )
 
@@ -623,9 +621,7 @@ class AuthLoginCustomerDomainTest(TestCase):
             resp = self.client.post(
                 self.path,
                 {"username": non_staff_user.username, "password": "admin", "op": "login"},
-                # This should preferably be HTTP_HOST.
-                # Using SERVER_NAME until https://code.djangoproject.com/ticket/32106 is fixed.
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
             assert resp.status_code == 200
@@ -668,7 +664,7 @@ class AuthLoginCustomerDomainTest(TestCase):
             resp = self.client.post(
                 self.path,
                 {"username": user.username, "password": "admin", "op": "login"},
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
 
@@ -687,7 +683,7 @@ class AuthLoginCustomerDomainTest(TestCase):
             resp = self.client.post(
                 self.path,
                 {"username": user.username, "password": "admin", "op": "login"},
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
 
@@ -712,7 +708,7 @@ class AuthLoginCustomerDomainTest(TestCase):
                     "op": "sso",
                     "organization": "foobar",
                 },
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
             assert resp.status_code == 200
@@ -734,7 +730,7 @@ class AuthLoginCustomerDomainTest(TestCase):
                     "op": "sso",
                     "organization": "albertos-apples",
                 },
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
             assert resp.status_code == 200
@@ -759,7 +755,7 @@ class AuthLoginCustomerDomainTest(TestCase):
                     "op": "sso",
                     "organization": "albertos-apples",
                 },
-                SERVER_NAME="albertos-apples.testserver",
+                HTTP_HOST="albertos-apples.testserver",
                 follow=True,
             )
             assert resp.status_code == 200

+ 1 - 1
tests/sentry/web/frontend/test_group_tag_export.py

@@ -80,7 +80,7 @@ class GroupTagExportTest(TestCase, SnubaTestCase):
         self.url = f"{url}?environment={self.environment.name}"
 
         response = self.client.get(
-            self.url, SERVER_NAME=f"{self.project.organization.slug}.testserver"
+            self.url, HTTP_HOST=f"{self.project.organization.slug}.testserver"
         )
         self.verify_test(response)
 

+ 3 - 3
tests/sentry/web/frontend/test_home.py

@@ -52,7 +52,7 @@ class HomeTest(TestCase):
         with self.feature({"system:multi-region": True}):
             response = self.client.get(
                 "/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -69,7 +69,7 @@ class HomeTest(TestCase):
         with self.feature({"system:multi-region": True}):
             response = self.client.get(
                 "/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -88,7 +88,7 @@ class HomeTest(TestCase):
         with self.feature({"system:multi-region": True}):
             response = self.client.get(
                 "/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
                 follow=True,
             )
             assert response.status_code == 200

+ 2 - 2
tests/sentry/web/frontend/test_newest_performance_issue.py

@@ -99,11 +99,11 @@ class NewestIssueViewTest(TestCase, PerformanceIssueTestCase):
             manager.save(self.project1.id)
 
         domain = f"{self.org.slug}.testserver"
-        resp = self.client.get("/newest-performance-issue/", follow=True, SERVER_NAME=domain)
+        resp = self.client.get("/newest-performance-issue/", follow=True, HTTP_HOST=domain)
         assert resp.redirect_chain == [(f"http://{domain}/issues/{event1.group.id}/", 302)]
 
         self.login_as(self.owner)
-        resp = self.client.get("/newest-performance-issue/", follow=True, SERVER_NAME=domain)
+        resp = self.client.get("/newest-performance-issue/", follow=True, HTTP_HOST=domain)
         assert resp.redirect_chain == [(f"http://{domain}/issues/{event2.group.id}/", 302)]
 
     def test_no_performance_issue(self):

+ 1 - 1
tests/sentry/web/frontend/test_organization_auth_settings.py

@@ -240,7 +240,7 @@ class OrganizationAuthSettingsTest(AuthProviderTestCase):
         self.login_as(self.user, organization_id=organization.id)
 
         with self.feature("organizations:sso-basic"):
-            resp = self.client.get(path, SERVER_NAME=f"{organization.slug}.testserver")
+            resp = self.client.get(path, HTTP_HOST=f"{organization.slug}.testserver")
 
         content = resp.content.decode("utf-8")
         assert f"http://{organization.slug}.testserver" in content

+ 5 - 5
tests/sentry/web/frontend/test_react_page.py

@@ -354,7 +354,7 @@ class ReactPageViewTest(TestCase):
         with self.feature({"system:multi-region": True}):
             response = self.client.get(
                 "/issues/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
             )
             assert response.status_code == 200
             self.assertTemplateUsed(response, "sentry/base-react.html")
@@ -369,7 +369,7 @@ class ReactPageViewTest(TestCase):
         with self.feature({"system:multi-region": True}):
             response = self.client.get(
                 "/issues/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -388,7 +388,7 @@ class ReactPageViewTest(TestCase):
         with self.feature({"system:multi-region": True}):
             response = self.client.get(
                 "/issues/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -405,7 +405,7 @@ class ReactPageViewTest(TestCase):
         with self.feature({"organizations:profiling-browser": [org.slug]}):
             response = self.client.get(
                 "/issues/",
-                SERVER_NAME=f"{org.slug}.testserver",
+                HTTP_HOST=f"{org.slug}.testserver",
                 follow=True,
             )
             assert response.status_code == 200
@@ -418,7 +418,7 @@ class ReactPageViewTest(TestCase):
 
         response = self.client.get(
             "/issues/",
-            SERVER_NAME=f"{org.slug}.testserver",
+            HTTP_HOST=f"{org.slug}.testserver",
             follow=True,
         )
         assert response.status_code == 200

Some files were not shown because too many files changed in this diff