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

Ensure test results are reported when feedback files are missing AB#118 #459

Merged
merged 2 commits into from
Dec 14, 2023
Merged

Ensure test results are reported when feedback files are missing AB#118 #459

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
aa0ddbb
Ensure test results are reported when feedback files are missing
david-yz-liu Dec 2, 2023
2ede305
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 2, 2023
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
2 changes: 2 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ All notable changes to this project will be documented here.

## [unreleased]

- Fix bug that prevented test results from being returned when a feedback file could not be found (#458)

## [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
14 changes: 9 additions & 5 deletions server/autotest_server/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from __future__ import annotations
import os
import sys
import shutil
Expand Down Expand Up @@ -134,9 +135,9 @@ def _get_env_vars(test_username: str) -> Dict[str, str]:
return env_vars


def _get_feedback(test_data, tests_path, test_id):
def _get_feedback(test_data, tests_path, test_id) -> tuple[dict, str]:
feedback_files = test_data.get("feedback_file_names", [])
feedback = []
feedback, feedback_errors = [], []
for feedback_file in feedback_files:
feedback_path = os.path.join(tests_path, feedback_file)
if os.path.isfile(feedback_path):
Expand All @@ -155,8 +156,8 @@ def _get_feedback(test_data, tests_path, test_id):
}
)
else:
raise Exception(f"Cannot find feedback file at '{feedback_path}'.")
return feedback
feedback_errors.append(feedback_file)
return feedback, feedback_errors


def _update_env_vars(base_env: Dict, test_env: Dict) -> Dict:
Expand Down Expand Up @@ -233,7 +234,10 @@ def _run_test_specs(
finally:
duration = int(round(time.time() - start, 3) * 1000)
extra_info = test_data.get("extra_info", {})
feedback = _get_feedback(test_data, tests_path, test_id)
feedback, feedback_errors = _get_feedback(test_data, tests_path, test_id)
if feedback_errors:
msg = "Cannot find feedback file(s): " + ", ".join(feedback_errors)
err = err + "\n\n" + msg if err else msg
results.append(_create_test_group_result(out, err, duration, extra_info, feedback, timeout_expired))
return results

Expand Down
Loading