Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(parse-errors): ensure if block execution #1854

Merged
merged 2 commits into from
Aug 30, 2024
Merged

fix(parse-errors): ensure if block execution #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
616c088
fix(parse-errors): ensure if block execution
kmosti Apr 3, 2024
bb7ab50
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jira/resilientsession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ def parse_errors(resp: Response) -> list[str]:
if "message" in resp_data:
# Jira 5.1 errors
parsed_errors = [resp_data["message"]]
elif "errorMessage" in resp_data:
if "errorMessage" in resp_data:
# Sometimes Jira returns `errorMessage` as a message error key
# for example for the "Service temporary unavailable" error
parsed_errors = [resp_data["errorMessage"]]
elif "errorMessages" in resp_data:
if "errorMessages" in resp_data:
# Jira 5.0.x error messages sometimes come wrapped in this array
# Sometimes this is present but empty
error_messages = resp_data["errorMessages"]
Expand All @@ -118,7 +118,7 @@ def parse_errors(resp: Response) -> list[str]:
parsed_errors = list(error_messages)
else:
parsed_errors = [error_messages]
elif "errors" in resp_data:
if "errors" in resp_data:
resp_errors = resp_data["errors"]
if len(resp_errors) > 0 and isinstance(resp_errors, dict):
# Catching only 'errors' that are dict. See https://github.com/pycontribs/jira/issues/350
Expand Down
6 changes: 6 additions & 0 deletions tests/test_resilientsession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ def test_status_codes_retries(
(500, {}, '{"errorMessages": "err1"}', ["err1"]),
(500, {}, '{"errorMessages": ["err1", "err2"]}', ["err1", "err2"]),
(500, {}, '{"errors": {"code1": "err1", "code2": "err2"}}', ["err1", "err2"]),
(
500,
{},
'{"errorMessages": [], "errors": {"code1": "err1", "code2": "err2"}}',
["err1", "err2"],
),
]


Expand Down
Loading