Skip to content

Commit 9d71e85

Browse files
committed
fix(cms): Make CMS module work with newer changes to Pisek
1 parent c701876 commit 9d71e85

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

pisek/cms/dataset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def create_dataset(
9999
)
100100

101101
for num, test in config.test_sections.items():
102-
check_key(f"[test{num:02d}] points", test.points, lambda p: p % 1 == 0)
102+
check_key(f"[test{num:02d}] points", test.max_points, lambda p: p % 1 == 0)
103103

104104
score_params = get_group_score_parameters(config)
105105

@@ -206,7 +206,7 @@ def add_judge(session: Session, files: FileCacher, env: Env, dataset: Dataset):
206206
assert config.tests.out_judge is not None
207207

208208
run_section = config.tests.out_judge
209-
judge_path = TaskPath(BUILD_DIR, run_section.exec.path).path
209+
judge_path = run_section.executable.path
210210

211211
if path.isdir(judge_path):
212212
run_path = path.join(judge_path, "run")

pisek/cms/result.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ def check_results(session: Session, env: Env, dataset: Dataset) -> None:
170170
"W",
171171
"T",
172172
"!",
173+
"N",
173174
), f"Unknown expected result '{target}'"
174175

175176
target_name = "wrong"

pisek/jobs/logging.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ def __init__(self, callback: Callable[[LogEntry], None], level=logging.NOTSET):
7676

7777
def emit(self, record):
7878
try:
79+
if hasattr(record, "scope"):
80+
scope = record.scope
81+
else:
82+
scope = "unknown"
7983
self.__callback(
80-
LogEntry(record.scope, record.levelname.lower(), record.msg)
84+
LogEntry(scope, record.levelname.lower(), record.msg)
8185
)
8286
except Exception:
8387
self.handleError(record)

0 commit comments

Comments
 (0)