Skip to content

Commit 52e8231

Browse files
th3coopth3coop
committed
Make user facing error message indicate a more appropriate follow up action
1 parent a791132 commit 52e8231

File tree

11 files changed

+243
-307
lines changed

11 files changed

+243
-307
lines changed

‎tests/unit/accounts/test_views.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3371,7 +3371,7 @@ def test_manage_publishing(self, metrics, monkeypatch):
33713371
},
33723372
"pending_github_publisher_form": pending_github_publisher_form_obj,
33733373
"pending_google_publisher_form": pending_google_publisher_form_obj,
3374-
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa
3374+
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa: E501
33753375
}
33763376

33773377
assert request.flags.disallow_oidc.calls == [
@@ -3441,7 +3441,7 @@ def test_manage_publishing_admin_disabled(self, monkeypatch, pyramid_request):
34413441
},
34423442
"pending_github_publisher_form": pending_github_publisher_form_obj,
34433443
"pending_google_publisher_form": pending_google_publisher_form_obj,
3444-
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa
3444+
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa: E501
34453445
}
34463446

34473447
assert pyramid_request.flags.disallow_oidc.calls == [
@@ -3543,7 +3543,7 @@ def test_add_pending_oidc_publisher_admin_disabled(
35433543
},
35443544
"pending_github_publisher_form": pending_github_publisher_form_obj,
35453545
"pending_google_publisher_form": pending_google_publisher_form_obj,
3546-
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa
3546+
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa: E501
35473547
}
35483548

35493549
assert pyramid_request.flags.disallow_oidc.calls == [
@@ -3654,7 +3654,7 @@ def test_add_pending_oidc_publisher_user_cannot_register(
36543654
},
36553655
"pending_github_publisher_form": pending_github_publisher_form_obj,
36563656
"pending_google_publisher_form": pending_google_publisher_form_obj,
3657-
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa
3657+
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa: E501
36583658
}
36593659

36603660
assert pyramid_request.flags.disallow_oidc.calls == [
@@ -4305,7 +4305,7 @@ def test_delete_pending_oidc_publisher_admin_disabled(
43054305
},
43064306
"pending_github_publisher_form": pending_github_publisher_form_obj,
43074307
"pending_google_publisher_form": pending_google_publisher_form_obj,
4308-
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa
4308+
"pending_activestate_publisher_form": pending_activestate_publisher_form_obj, # noqa: E501
43094309
}
43104310

43114311
assert pyramid_request.flags.disallow_oidc.calls == [

‎tests/unit/oidc/forms/test_activestate.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def test_lookup_actor_404(self, monkeypatch):
108108
pretend.call(
109109
"https://platform.activestate.com/graphql/v1/graphql",
110110
json={
111-
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa
111+
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa: E501
112112
"variables": {"username": fake_username},
113113
},
114114
timeout=5,
@@ -142,7 +142,7 @@ def test_lookup_actor_other_http_error(self, monkeypatch):
142142
pretend.call(
143143
"https://platform.activestate.com/graphql/v1/graphql",
144144
json={
145-
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa
145+
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa: E501
146146
"variables": {"username": fake_username},
147147
},
148148
timeout=5,
@@ -244,7 +244,7 @@ def test_lookup_actor_gql_error(self, monkeypatch):
244244
pretend.call(
245245
"https://platform.activestate.com/graphql/v1/graphql",
246246
json={
247-
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa
247+
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa: E501
248248
"variables": {"username": fake_username},
249249
},
250250
timeout=5,
@@ -275,7 +275,7 @@ def test_lookup_actor_gql_no_data(self, monkeypatch):
275275
pretend.call(
276276
"https://platform.activestate.com/graphql/v1/graphql",
277277
json={
278-
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa
278+
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa: E501
279279
"variables": {"username": fake_username},
280280
},
281281
timeout=5,
@@ -304,7 +304,7 @@ def test_lookup_actor_succeeds(self, monkeypatch):
304304
pretend.call(
305305
"https://platform.activestate.com/graphql/v1/graphql",
306306
json={
307-
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa
307+
"query": "query($username: String) {users(where: {username: {_eq: $username}}) {user_id}}", # noqa: E501
308308
"variables": {"username": fake_username},
309309
},
310310
timeout=5,
@@ -337,7 +337,7 @@ def test_lookup_organization_404(self, monkeypatch):
337337
pretend.call(
338338
"https://platform.activestate.com/graphql/v1/graphql",
339339
json={
340-
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa
340+
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa: E501
341341
"variables": {"orgname": fake_org_name},
342342
},
343343
timeout=5,
@@ -371,7 +371,7 @@ def test_lookup_organization_other_http_error(self, monkeypatch):
371371
pretend.call(
372372
"https://platform.activestate.com/graphql/v1/graphql",
373373
json={
374-
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa
374+
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa: E501
375375
"variables": {"orgname": fake_org_name},
376376
},
377377
timeout=5,
@@ -474,7 +474,7 @@ def test_lookup_organization_gql_error(self, monkeypatch):
474474
pretend.call(
475475
"https://platform.activestate.com/graphql/v1/graphql",
476476
json={
477-
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa
477+
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa: E501
478478
"variables": {"orgname": fake_org_name},
479479
},
480480
timeout=5,
@@ -506,7 +506,7 @@ def test_lookup_organization_gql_no_data(self, monkeypatch):
506506
pretend.call(
507507
"https://platform.activestate.com/graphql/v1/graphql",
508508
json={
509-
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa
509+
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa: E501
510510
"variables": {"orgname": fake_org_name},
511511
},
512512
timeout=5,
@@ -530,7 +530,7 @@ def test_lookup_organization_succeeds(self, monkeypatch):
530530
pretend.call(
531531
"https://platform.activestate.com/graphql/v1/graphql",
532532
json={
533-
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa
533+
"query": "query($orgname: String) {organizations(where: {display_name: {_eq: $orgname}}) {added}}", # noqa: E501
534534
"variables": {"orgname": fake_org_name},
535535
},
536536
timeout=5,

‎warehouse/accounts/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1520,7 +1520,7 @@ def default_response(self):
15201520
return {
15211521
"pending_github_publisher_form": self.pending_github_publisher_form,
15221522
"pending_google_publisher_form": self.pending_google_publisher_form,
1523-
"pending_activestate_publisher_form": self.pending_activestate_publisher_form, # noqa
1523+
"pending_activestate_publisher_form": self.pending_activestate_publisher_form, # noqa: E501
15241524
"disabled": {
15251525
"GitHub": self.request.flags.disallow_oidc(
15261526
AdminFlagValue.DISALLOW_GITHUB_OIDC

0 commit comments

Comments
 (0)