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.

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

V2.3.2 #453

Merged
merged 4 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# CHANGELOG
All notable changes to this project will be documented here.

## [v2.3.2]
- Fix a bug in the Java tester, where failed/error tests were being detected as passing. (#451)
- updated python-ta to 2.6.1 (#452)

## [v2.3.1]
- Fix a bug that prevented test file from being copied from a zip file to another location on disk (#426)

Expand Down
6 changes: 3 additions & 3 deletions server/autotest_server/testers/java/java_tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ def _parse_failure_error(self, failure, error):
an error and failure are present, the message includes information for both.
"""
result = {}
if failure and error:
if failure is not None and error is not None:
failure_message = self._parse_failure_error(failure, None)["message"]
error_message = self._parse_failure_error(None, error)["message"]
result["status"] = "error"
result["message"] = "\n\n".join([error_message, failure_message])
elif failure:
elif failure is not None:
result["status"] = "failure"
result["message"] = f'{failure.attrib.get("type", "")}: {failure.attrib.get("message", "")}'
elif error:
elif error is not None:
result["status"] = "error"
result["message"] = f'{error.attrib.get("type", "")}: {error.attrib.get("message", "")}'
return result
Expand Down
2 changes: 1 addition & 1 deletion server/autotest_server/testers/pyta/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
python-ta==1.4.2;python_version<"3.8"
python-ta==2.3.2; python_version>="3.8"
python-ta==2.6.1; python_version>="3.8"
isort<5;python_version<"3.8"
Loading