Skip to content

Commit

Permalink
Merge pull request #576 from dbaldy/main
Browse files Browse the repository at this point in the history
bugfix: fix error message printing error
  • Loading branch information
simondeziel authored Apr 4, 2024
2 parents 118ef8d + c5702a2 commit afb1b84
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
8 changes: 7 additions & 1 deletion pylxd/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ def __init__(self, response):
def __str__(self):
if self.response.status_code == 200: # Operation failure
try:
return self.response.json()["metadata"]["err"]
json_response = self.response.json()
metadata = json_response.get("metadata")
if metadata and isinstance(metadata, dict) and "err" in metadata:
return json_response["metadata"]["err"]
if "error" in json_response:
return json_response["error"]
return str(json_response)
except (ValueError, KeyError):
pass

Expand Down
23 changes: 23 additions & 0 deletions pylxd/models/tests/test_operation.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,29 @@ def error(request, context):

self.assertRaises(exceptions.LXDAPIException, an_operation.wait)

def test_wait_with_error_async_without_metadata(self):
"""If the operation errors, wait raises an exception."""

def error(request, context):
context.status_code = 200
return {"type": "async", "error": "Could not proceed", "metadata": None}

self.add_rule(
{
"json": error,
"method": "GET",
"url": r"^http://pylxd.test/1.0/operations/operation-abc/wait$",
}
)

name = "/1.0/operations/operation-abc"

an_operation = models.Operation.get(self.client, name)

with self.assertRaises(exceptions.LXDAPIException) as wait_cm:
an_operation.wait()
assert str(wait_cm.exception) == "Could not proceed"

def test_unknown_attribute(self):
self.add_rule(
{
Expand Down

0 comments on commit afb1b84

Please sign in to comment.