Skip to content

Commit d412b15

Browse files
committed
fix docker running error exit
1 parent 8160bf1 commit d412b15

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

commit0/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def main() -> None:
2020
)
2121
# type check config values
2222
cs = ConfigStore.instance()
23-
cs.store(name="user", node=Commit0Config)
23+
cs.store(name="user", group="Commit0Config", node=Commit0Config)
2424
# have hydra to ignore all command-line arguments
2525
sys_argv = copy.deepcopy(sys.argv)
2626
sys.argv = [sys.argv[0]]

commit0/harness/run_pytest_ids.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def run_docker(
4444
timeout: int,
4545
log_dir: Path,
4646
stdout: bool,
47-
) -> None:
47+
) -> str:
4848
client = docker.from_env()
4949
container = None
5050
try:
@@ -91,18 +91,21 @@ def run_docker(
9191
if exit_code == 0:
9292
copy_from_container(container, report_file, Path(log_dir / "report.json"))
9393
delete_file_from_container(container, str(report_file))
94+
return test_output
9495

9596
except EvaluationError as e:
9697
error_msg = traceback.format_exc()
9798
logger.info(error_msg)
9899
print(e)
100+
return error_msg
99101
except Exception as e:
100102
error_msg = (
101103
f"Error in running pytest for {spec.repo}: {e}\n"
102104
f"{traceback.format_exc()}\n"
103105
# f"Check ({logger.log_file}) for more information."
104106
)
105107
logger.error(error_msg)
108+
return error_msg
106109
finally:
107110
# Remove repo container + image, close logger
108111
assert container is not None
@@ -253,10 +256,13 @@ def main(
253256
eval_file = Path(log_dir / "eval.sh")
254257
eval_file.write_text(eval_script)
255258

259+
error_message = None
256260
if ExecutionBackend(backend) == ExecutionBackend.LOCAL:
257-
run_docker(spec, logger, eval_file, timeout, log_dir, stdout)
261+
error_message = run_docker(spec, logger, eval_file, timeout, log_dir, stdout)
258262
elif ExecutionBackend(backend) == ExecutionBackend.MODAL:
259263
run_modal(spec, logger, eval_file, timeout, log_dir, stdout)
264+
if error_message:
265+
return error_message
260266
return str(log_dir)
261267

262268

0 commit comments

Comments
 (0)