fix: give the HTTP status of failures without a SCIM error

Author: azmeuk

doc/changelog.rst

@@ -23,6 +23,10 @@ Changed
 
 Fixed
 ^^^^^
+- A failure the server answers without a SCIM error, such as an HTML page or a ``404`` without
+  body, gives its HTTP status: ``Error: The server answered 404 without a SCIM error``.
+  A ``404`` without body used to exit with the code 0.
+  scim2-client 0.13.2 is now the minimum supported version. :issue:`12`
 - The help of ``query``, ``search``, ``delete``, ``modify``, ``bulk`` and ``test`` is displayed
   without a server URL and without contacting the server.
 

pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 requires-python = ">= 3.11"
 dependencies = [
     "click>=8.5.0",
-    "scim2-client[httpx2]>=0.13.0",
+    "scim2-client[httpx2]>=0.13.2",
     "scim2-tester>=0.5.1",
     "sphinx-click-rst-to-ansi-formatter>=0.2.0",
     "pydanclick>=0.5.0",

tests/test_create.py

@@ -93,7 +93,7 @@ def test_no_command_scimclient_error(runner, httpserver, simple_user_payload):
         catch_exceptions=False,
     )
     assert result.exit_code == 1, result.output
-    assert "Unexpected response status code: 999" in result.output
+    assert "Error: The server answered 999 without a SCIM error" in result.output
 
 
 def test_no_command_validation_error(runner, httpserver, simple_user_payload):

tests/test_delete.py

@@ -51,7 +51,7 @@ def test_scimclient_error(runner, httpserver):
         catch_exceptions=False,
     )
     assert result.exit_code == 1, result.output
-    assert "Unexpected response status code: 999" in result.output
+    assert "Error: The server answered 999 without a SCIM error" in result.output
 
 
 def test_bad_resource_type(runner, httpserver):

tests/test_errors.py

@@ -71,3 +71,27 @@ def test_success_does_not_fail_the_command(runner, httpserver, simple_user_paylo
 
     assert result.exit_code == 0, result.output
     assert result.stderr == ""
+
+
+@pytest.mark.parametrize(
+    ("status", "content_type", "body"),
+    [
+        (404, "text/html", "<html>Not Found</html>"),
+        (403, "text/plain", "Forbidden"),
+        (404, "application/scim+json", ""),
+        (401, "application/json", '{"error": "unauthorized"}'),
+        (502, "text/html", "<html>Bad Gateway</html>"),
+    ],
+)
+def test_failure_without_scim_error(runner, httpserver, status, content_type, body):
+    """A failure without a SCIM error reports its HTTP status and fails the command."""
+    httpserver.expect_oneshot_request("/Users/1").respond_with_data(
+        body, status=status, content_type=content_type
+    )
+
+    result = runner.invoke(
+        cli, ["--url", httpserver.url_for("/"), "query", "user", "1"]
+    )
+
+    assert result.exit_code == 1, result.output
+    assert f"Error: The server answered {status} without a SCIM error" in result.output

tests/test_modify.py

@@ -324,15 +324,15 @@ def test_error_response(invoke, httpserver):
 
 
 def test_unexpected_response(invoke, httpserver):
-    """A response that is not a SCIM message is reported."""
+    """A failure that is not a SCIM message reports its status."""
     httpserver.expect_oneshot_request("/Users/1", method="PATCH").respond_with_data(
         "<html>Internal Server Error</html>", status=500, content_type="text/html"
     )
 
     result = invoke("modify", "user", "1", "remove", "nickName")
 
     assert result.exit_code == 1, result.output
-    assert "Error: Unexpected response content format" in result.output
+    assert "Error: The server answered 500 without a SCIM error" in result.output
 
 
 def test_me(invoke, httpserver, simple_user_payload):

tests/test_query.py

@@ -323,7 +323,7 @@ def test_scimclient_error(runner, httpserver, simple_user_payload):
         catch_exceptions=False,
     )
     assert result.exit_code == 1, result.output
-    assert "Unexpected response status code: 999" in result.output
+    assert "Error: The server answered 999 without a SCIM error" in result.output
 
 
 def test_validation_error(runner, httpserver, simple_user_payload):

tests/test_replace.py

@@ -117,7 +117,7 @@ def test_no_command_scimclient_error(runner, httpserver, simple_user_payload):
         catch_exceptions=False,
     )
     assert result.exit_code == 1, result.output
-    assert "Unexpected response status code: 999" in result.output
+    assert "Error: The server answered 999 without a SCIM error" in result.output
 
 
 def test_no_command_validation_error(runner, httpserver, simple_user_payload):
@@ -272,7 +272,7 @@ def test_command_scimclient_error(runner, httpserver, simple_user_payload):
         catch_exceptions=False,
     )
     assert result.exit_code == 1, result.output
-    assert "Unexpected response status code: 999" in result.output
+    assert "Error: The server answered 999 without a SCIM error" in result.output
 
 
 def test_command_validation_error(runner, httpserver, simple_user_payload):

tests/test_search.py

@@ -105,7 +105,7 @@ def test_scimclient_error(runner, httpserver, simple_user_payload):
         catch_exceptions=False,
     )
     assert result.exit_code == 1, result.output
-    assert "Unexpected response status code: 666" in result.output
+    assert "Error: The server answered 666 without a SCIM error" in result.output
 
 
 def test_search_a_resource_type(runner, httpserver, simple_user_payload):