Skip to content

Fix misc issues regarding user tests with graders #1172

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

Merged
andreyv merged 1 commit into from
Mar 26, 2021
Merged

Fix misc issues regarding user tests with graders #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions cms/grading/Job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,15 @@ def from_user_test(operation, user_test, dataset):
managers[manager_filename] = \
dataset.managers[manager_filename]

# Copy header files from dataset.
# FIXME This bypasses get_auto_managers() logic
if language is not None:
for manager_filename in dataset.managers:
if any(manager_filename.endswith(header)
for header in language.header_extensions):
managers[manager_filename] = \
dataset.managers[manager_filename]

return CompilationJob(
operation=operation,
task_type=dataset.task_type,
Expand Down
6 changes: 4 additions & 2 deletions cms/server/contest/handlers/taskusertest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,10 @@ def get(self, task_name, user_test_num, filename):

if stored_filename in user_test.files:
digest = user_test.files[stored_filename].digest
elif stored_filename in user_test.managers:
digest = user_test.managers[stored_filename].digest
elif filename in user_test.managers:
# Graders are not stored with the .%l suffix
# Instead, the original name is used
digest = user_test.managers[filename].digest
else:
raise tornado_web.HTTPError(404)
self.sql_session.close()
Expand Down