Skip to content

Commit 1326a16

Browse files
asottile-sentryChristinarlong
authored andcommitted
ref: fix shadowing of make_request in tests (#74801)
fixes an error in mypy 1.11 <!-- Describe your PR here. -->
1 parent 2903fa4 commit 1326a16

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

tests/sentry/utils/test_auth.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def test_does_not_authenticate_with_invalid_password(self):
5656

5757
@control_silo_test
5858
class GetLoginRedirectTest(TestCase):
59-
def make_request(self, next=None):
59+
def _make_request(self, next=None):
6060
request = HttpRequest()
6161
request.META["SERVER_NAME"] = "testserver"
6262
request.META["SERVER_PORT"] = "80"
@@ -67,75 +67,75 @@ def make_request(self, next=None):
6767
return request
6868

6969
def test_schema_uses_default(self):
70-
result = get_login_redirect(self.make_request("http://example.com"))
70+
result = get_login_redirect(self._make_request("http://example.com"))
7171
assert result == reverse("sentry-login")
7272

73-
result = get_login_redirect(self.make_request("ftp://testserver"))
73+
result = get_login_redirect(self._make_request("ftp://testserver"))
7474
assert result == reverse("sentry-login")
7575

7676
def test_next(self):
77-
result = get_login_redirect(self.make_request("http://testserver/foobar/"))
77+
result = get_login_redirect(self._make_request("http://testserver/foobar/"))
7878
assert result == "http://testserver/foobar/"
7979

80-
result = get_login_redirect(self.make_request("ftp://testserver/foobar/"))
80+
result = get_login_redirect(self._make_request("ftp://testserver/foobar/"))
8181
assert result == reverse("sentry-login")
8282

83-
request = self.make_request("/foobar/")
83+
request = self._make_request("/foobar/")
8484
request.subdomain = "orgslug"
8585
result = get_login_redirect(request)
8686
assert result == "http://orgslug.testserver/foobar/"
8787

88-
request = self.make_request("http://testserver/foobar/")
88+
request = self._make_request("http://testserver/foobar/")
8989
request.subdomain = "orgslug"
9090
result = get_login_redirect(request)
9191
assert result == "http://testserver/foobar/"
9292

93-
request = self.make_request("ftp://testserver/foobar/")
93+
request = self._make_request("ftp://testserver/foobar/")
9494
request.subdomain = "orgslug"
9595
result = get_login_redirect(request)
9696
assert result == f"http://orgslug.testserver{reverse('sentry-login')}"
9797

9898
def test_after_2fa(self):
99-
request = self.make_request()
99+
request = self._make_request()
100100
request.session["_after_2fa"] = "http://testserver/foobar/"
101101
result = get_login_redirect(request)
102102
assert result == "http://testserver/foobar/"
103103

104-
request = self.make_request()
104+
request = self._make_request()
105105
request.subdomain = "orgslug"
106106
request.session["_after_2fa"] = "/foobar/"
107107
result = get_login_redirect(request)
108108
assert result == "http://orgslug.testserver/foobar/"
109109

110110
def test_pending_2fa(self):
111-
request = self.make_request()
111+
request = self._make_request()
112112
request.session["_pending_2fa"] = [1234, 1234, 1234]
113113
result = get_login_redirect(request)
114114
assert result == reverse("sentry-2fa-dialog")
115115

116-
request = self.make_request()
116+
request = self._make_request()
117117
request.subdomain = "orgslug"
118118
request.session["_pending_2fa"] = [1234, 1234, 1234]
119119
result = get_login_redirect(request)
120120
assert result == f"http://orgslug.testserver{reverse('sentry-2fa-dialog')}"
121121

122122
def test_login_uses_default(self):
123-
result = get_login_redirect(self.make_request(reverse("sentry-login")))
123+
result = get_login_redirect(self._make_request(reverse("sentry-login")))
124124
assert result == reverse("sentry-login")
125125

126126
def test_no_value_uses_default(self):
127-
result = get_login_redirect(self.make_request())
127+
result = get_login_redirect(self._make_request())
128128
assert result == reverse("sentry-login")
129129

130-
request = self.make_request()
130+
request = self._make_request()
131131
request.subdomain = "orgslug"
132132
result = get_login_redirect(request)
133133
assert result == f"http://orgslug.testserver{reverse('sentry-login')}"
134134

135135

136136
@control_silo_test
137137
class LoginTest(TestCase):
138-
def make_request(self, next=None):
138+
def _make_request(self, next=None):
139139
request = HttpRequest()
140140
request.META["REMOTE_ADDR"] = "127.0.0.1"
141141
request.session = self.session
@@ -145,14 +145,14 @@ def make_request(self, next=None):
145145
return request
146146

147147
def test_simple(self):
148-
request = self.make_request()
148+
request = self._make_request()
149149
assert login(request, self.user)
150150
assert request.user == self.user
151151
assert "_nonce" not in request.session
152152

153153
def test_with_organization(self):
154154
org = self.create_organization(name="foo", owner=self.user)
155-
request = self.make_request()
155+
request = self._make_request()
156156
assert login(request, self.user, organization_id=org.id)
157157
assert request.user == self.user
158158
assert f"{SsoSession.SSO_SESSION_KEY}:{org.id}" in request.session
@@ -161,7 +161,7 @@ def test_with_nonce(self):
161161
self.user.refresh_session_nonce()
162162
self.user.save()
163163
assert self.user.session_nonce is not None
164-
request = self.make_request()
164+
request = self._make_request()
165165
assert login(request, self.user)
166166
assert request.user == self.user
167167
assert request.session["_nonce"] == self.user.session_nonce

0 commit comments

Comments
 (0)