Linting, translations, tests

Author: th3coop

tests/unit/oidc/forms/test_activestate.py

@@ -12,6 +12,7 @@
 
 import pretend
 import pytest
+import requests
 import wtforms
 
 from requests import ConnectionError, HTTPError, Timeout
@@ -26,6 +27,12 @@
 fake_gql_org_response = {"data": {"organizations": [fake_org_info]}}
 fake_gql_user_response = {"data": {"users": [fake_user_info]}}
 
+_requests = requests
+
+
+def _raise(exception):
+    raise exception
+
 
 class TestPendingActiveStatePublisherForm:
     def test_validate(self, monkeypatch):
@@ -137,8 +144,7 @@ def test_lookup_actor_other_http_error(self, monkeypatch):
 
         assert sentry_sdk.capture_message.calls == [
             pretend.call(
-                "Unexpected error from ActiveState user lookup: "
-                "response.content=b'fake-content'"
+                "Unexpected error from ActiveState actor lookup: " "b'fake-content'"
             )
         ]
 
@@ -159,7 +165,7 @@ def test_lookup_actor_http_timeout(self, monkeypatch):
             form._lookup_actor(fake_username)
 
         assert sentry_sdk.capture_message.calls == [
-            pretend.call("Timeout from ActiveState user lookup API (possibly offline)")
+            pretend.call("Timeout from ActiveState actor lookup API (possibly offline)")
         ]
 
     def test_lookup_actor_connection_error(self, monkeypatch):
@@ -180,10 +186,36 @@ def test_lookup_actor_connection_error(self, monkeypatch):
 
         assert sentry_sdk.capture_message.calls == [
             pretend.call(
-                "Connection error from ActiveState user lookup API (possibly offline)"
+                "Connection error from ActiveState actor lookup API (possibly offline)"
             )
         ]
 
+    def test_lookup_actor_non_json(self, monkeypatch):
+        response = pretend.stub(
+            status_code=200,
+            raise_for_status=pretend.call_recorder(lambda: None),
+            json=lambda: _raise(_requests.exceptions.JSONDecodeError("", "", 0)),
+            content=b"",
+        )
+
+        requests = pretend.stub(
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
+        )
+        monkeypatch.setattr(activestate, "requests", requests)
+
+        sentry_sdk = pretend.stub(capture_message=pretend.call_recorder(lambda s: None))
+        monkeypatch.setattr(activestate, "sentry_sdk", sentry_sdk)
+
+        form = activestate.ActiveStatePublisherForm()
+        with pytest.raises(wtforms.validators.ValidationError):
+            form._lookup_actor(fake_username)
+
+        assert sentry_sdk.capture_message.calls == [
+            pretend.call("Unexpected error from ActiveState actor lookup: b''")  # noqa
+        ]
+
     def test_lookup_actor_gql_error(self, monkeypatch):
         response = pretend.stub(
             status_code=200,
@@ -192,7 +224,9 @@ def test_lookup_actor_gql_error(self, monkeypatch):
             content=b"fake-content",
         )
         requests = pretend.stub(
-            post=pretend.call_recorder(lambda o, **kw: response), HTTPError=HTTPError
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
         )
         monkeypatch.setattr(activestate, "requests", requests)
 
@@ -215,7 +249,7 @@ def test_lookup_actor_gql_error(self, monkeypatch):
         ]
         assert sentry_sdk.capture_message.calls == [
             pretend.call(
-                "Unexpected error from ActiveState user lookup: ['some error']"
+                "Unexpected error from ActiveState actor lookup: ['some error']"
             )
         ]
 
@@ -226,7 +260,9 @@ def test_lookup_actor_gql_no_data(self, monkeypatch):
             json=lambda: {"data": {"users": []}},
         )
         requests = pretend.stub(
-            post=pretend.call_recorder(lambda o, **kw: response), HTTPError=HTTPError
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
         )
         monkeypatch.setattr(activestate, "requests", requests)
 
@@ -280,7 +316,9 @@ def test_lookup_organization_404(self, monkeypatch):
             content=b"fake-content",
         )
         requests = pretend.stub(
-            post=pretend.call_recorder(lambda o, **kw: response), HTTPError=HTTPError
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
         )
 
         monkeypatch.setattr(activestate, "requests", requests)
@@ -333,8 +371,8 @@ def test_lookup_organization_other_http_error(self, monkeypatch):
 
         assert sentry_sdk.capture_message.calls == [
             pretend.call(
-                "Unexpected error from ActiveState user lookup: "
-                "response.content=b'fake-content'"
+                "Unexpected error from ActiveState organization lookup: "
+                "b'fake-content'"
             )
         ]
 
@@ -355,7 +393,9 @@ def test_lookup_organization_http_timeout(self, monkeypatch):
             form._lookup_organization(fake_org_name)
 
         assert sentry_sdk.capture_message.calls == [
-            pretend.call("Timeout from ActiveState user lookup API (possibly offline)")
+            pretend.call(
+                "Timeout from ActiveState organization lookup API (possibly offline)"
+            )
         ]
 
     def test_lookup_organization_connection_error(self, monkeypatch):
@@ -376,7 +416,35 @@ def test_lookup_organization_connection_error(self, monkeypatch):
 
         assert sentry_sdk.capture_message.calls == [
             pretend.call(
-                "Connection error from ActiveState user lookup API (possibly offline)"
+                "Connection error from ActiveState organization lookup API (possibly offline)"  # noqa
+            )
+        ]
+
+    def test_lookup_organization_non_json(self, monkeypatch):
+        response = pretend.stub(
+            status_code=200,
+            raise_for_status=pretend.call_recorder(lambda: None),
+            json=lambda: _raise(_requests.exceptions.JSONDecodeError("", "", 0)),
+            content=b"",
+        )
+
+        requests = pretend.stub(
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
+        )
+        monkeypatch.setattr(activestate, "requests", requests)
+
+        sentry_sdk = pretend.stub(capture_message=pretend.call_recorder(lambda s: None))
+        monkeypatch.setattr(activestate, "sentry_sdk", sentry_sdk)
+
+        form = activestate.ActiveStatePublisherForm()
+        with pytest.raises(wtforms.validators.ValidationError):
+            form._lookup_organization(fake_org_name)
+
+        assert sentry_sdk.capture_message.calls == [
+            pretend.call(
+                "Unexpected JsonDecode error from ActiveState organization lookup: b''"  # noqa
             )
         ]
 
@@ -385,10 +453,13 @@ def test_lookup_organization_gql_error(self, monkeypatch):
             status_code=200,
             raise_for_status=pretend.call_recorder(lambda: None),
             json=lambda: {"errors": ["some error"]},
-            content=b"fake-content",
+            content=b'{"errors": ["some error"]}',
         )
+
         requests = pretend.stub(
-            post=pretend.call_recorder(lambda o, **kw: response), HTTPError=HTTPError
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
         )
         monkeypatch.setattr(activestate, "requests", requests)
 
@@ -411,7 +482,7 @@ def test_lookup_organization_gql_error(self, monkeypatch):
         ]
         assert sentry_sdk.capture_message.calls == [
             pretend.call(
-                "Unexpected error from ActiveState user lookup: ['some error']"
+                "Unexpected error from ActiveState organization lookup: ['some error']"
             )
         ]
 
@@ -420,9 +491,12 @@ def test_lookup_organization_gql_no_data(self, monkeypatch):
             status_code=200,
             raise_for_status=pretend.call_recorder(lambda: None),
             json=lambda: {"data": {"organizations": []}},
+            content='{"data": {"organizations": []}}',
         )
         requests = pretend.stub(
-            post=pretend.call_recorder(lambda o, **kw: response), HTTPError=HTTPError
+            post=pretend.call_recorder(lambda o, **kw: response),
+            HTTPError=HTTPError,
+            exceptions=_requests.exceptions,
         )
         monkeypatch.setattr(activestate, "requests", requests)
 

warehouse/locale/messages.pot

@@ -363,7 +363,7 @@ msgid "Select project"
 msgstr ""
 
 #: warehouse/manage/forms.py:495 warehouse/oidc/forms/_core.py:23
-#: warehouse/oidc/forms/activestate.py:201
+#: warehouse/oidc/forms/activestate.py:224
 msgid "Specify project name"
 msgstr ""
 
@@ -550,11 +550,11 @@ msgstr ""
 msgid "Expired invitation for '${username}' deleted."
 msgstr ""
 
-#: warehouse/oidc/forms/_core.py:25 warehouse/oidc/forms/activestate.py:203
+#: warehouse/oidc/forms/_core.py:25 warehouse/oidc/forms/activestate.py:226
 msgid "Invalid project name"
 msgstr ""
 
-#: warehouse/oidc/forms/_core.py:35 warehouse/oidc/forms/activestate.py:217
+#: warehouse/oidc/forms/_core.py:35 warehouse/oidc/forms/activestate.py:240
 msgid "This project name is already in use"
 msgstr ""
 
@@ -567,43 +567,45 @@ msgid "Publisher must be specified by ID"
 msgstr ""
 
 #: warehouse/oidc/forms/activestate.py:46
-msgid "Specify ActiveState Organization URL name"
+msgid "Specify ActiveState organization name"
 msgstr ""
 
 #: warehouse/oidc/forms/activestate.py:50
-msgid "Invalid ActiveState Platform organization name"
+msgid "Invalid ActiveState organization name"
 msgstr ""
 
 #: warehouse/oidc/forms/activestate.py:58
 msgid "Specify ActiveState project name"
 msgstr ""
 
 #: warehouse/oidc/forms/activestate.py:62
-msgid "Invalid ActiveState Platform project name"
+msgid "Invalid ActiveState project name"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:98
-#: warehouse/oidc/forms/activestate.py:125
-#: warehouse/oidc/forms/activestate.py:154
-#: warehouse/oidc/forms/activestate.py:180
+#: warehouse/oidc/forms/activestate.py:100
+#: warehouse/oidc/forms/activestate.py:128
+#: warehouse/oidc/forms/activestate.py:142
+#: warehouse/oidc/forms/activestate.py:166
+#: warehouse/oidc/forms/activestate.py:194
+#: warehouse/oidc/forms/activestate.py:208
 msgid "Unexpected error from ActiveState. Try again"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:105
-#: warehouse/oidc/forms/activestate.py:161
+#: warehouse/oidc/forms/activestate.py:107
+#: warehouse/oidc/forms/activestate.py:173
 msgid "Unexpected connection error from ActiveState. Try again in a few minutes"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:115
-#: warehouse/oidc/forms/activestate.py:171
+#: warehouse/oidc/forms/activestate.py:117
+#: warehouse/oidc/forms/activestate.py:183
 msgid "Unexpected timeout from ActiveState. Try again in a few minutes"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:130
+#: warehouse/oidc/forms/activestate.py:135
 msgid "ActiveState organization not found"
 msgstr ""
 
-#: warehouse/oidc/forms/activestate.py:186
+#: warehouse/oidc/forms/activestate.py:201
 msgid "ActiveState actor not found"
 msgstr ""
 

warehouse/oidc/forms/activestate.py

@@ -94,14 +94,14 @@ def _lookup_organization(self, org_url_name: str) -> None:
             response.raise_for_status()
         except requests.HTTPError:
             sentry_sdk.capture_message(
-                f"Unexpected error from ActiveState organization lookup: {response.content=}"
+                f"Unexpected error from ActiveState organization lookup: {response.content}"  # noqa
             )
             raise wtforms.validators.ValidationError(
                 _("Unexpected error from ActiveState. Try again")
             )
         except requests.ConnectionError:
             sentry_sdk.capture_message(
-                "Connection error from ActiveState organization lookup API (possibly offline)"
+                "Connection error from ActiveState organization lookup API (possibly offline)"  # noqa
             )
             raise wtforms.validators.ValidationError(
                 _(
@@ -136,7 +136,7 @@ def _lookup_organization(self, org_url_name: str) -> None:
                 )
         except requests.exceptions.JSONDecodeError:
             sentry_sdk.capture_message(
-                f"Unexpected error from ActiveState organization lookup: {response.content=}"
+                f"Unexpected JsonDecode error from ActiveState organization lookup: {response.content}"  # noqa
             )
             raise wtforms.validators.ValidationError(
                 _("Unexpected error from ActiveState. Try again")
@@ -160,7 +160,7 @@ def _lookup_actor(self, actor: str) -> UserResponse:
             response.raise_for_status()
         except requests.HTTPError:
             sentry_sdk.capture_message(
-                f"Unexpected error from ActiveState actor lookup: {response.content=}"
+                f"Unexpected error from ActiveState actor lookup: {response.content}"
             )
             raise wtforms.validators.ValidationError(
                 _("Unexpected error from ActiveState. Try again")
@@ -202,7 +202,7 @@ def _lookup_actor(self, actor: str) -> UserResponse:
                 )
         except requests.exceptions.JSONDecodeError:
             sentry_sdk.capture_message(
-                f"Unexpected error from ActiveState actor lookup: {response.content=}"
+                f"Unexpected error from ActiveState actor lookup: {response.content}"
             )
             raise wtforms.validators.ValidationError(
                 _("Unexpected error from ActiveState. Try again")