Skip to content
Closed
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
6 changes: 3 additions & 3 deletions src/experimaestro/scheduler/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@ async def doStop():
assert self.scheduler is not None and self.scheduler.loop is not None
asyncio.run_coroutine_threadsafe(doStop(), self.scheduler.loop)

def failed_jobs(self) -> tuple[list[Job], list[Job]]:
def failed_jobs_by_reason(self) -> tuple[list[Job], list[Job]]:
"""The failed jobs of the experiment, as ``(failed, not_run)``: the
jobs that failed, and those not run because a dependency failed"""
from experimaestro.scheduler.jobs import JobFailureStatus
Expand All @@ -839,7 +839,7 @@ def failed_jobs(self) -> tuple[list[Job], list[Job]]:
def failure_summary(self) -> str:
"""Summary of the failed jobs, e.g. ``1 failed job (and 1 job not run
because of a failed dependency)``"""
failed, not_run = self.failed_jobs()
failed, not_run = self.failed_jobs_by_reason()
summary = f"{len(failed)} failed job{'s' if len(failed) != 1 else ''}"
if not_run:
summary += (
Expand All @@ -855,7 +855,7 @@ def _report_failed_jobs(self) -> None:
if not new:
return
self._reported_failures |= new
failed, _ = self.failed_jobs()
failed, _ = self.failed_jobs_by_reason()
for job in failed:
if job.identifier in new:
logger.error(
Expand Down
14 changes: 13 additions & 1 deletion src/experimaestro/tests/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def test_fail_dep(caplog):

assert xp.failed
# The dependent job is not run, rather than failed
assert xp.failed_jobs() == ([fail.__xpm__.job], [dep.__xpm__.job])
assert xp.failed_jobs_by_reason() == ([fail.__xpm__.job], [dep.__xpm__.job])
assert xp.failure_summary() == (
"1 failed job (and 1 job not run because of a failed dependency)"
)
Expand Down Expand Up @@ -638,3 +638,15 @@ def test_wait_blocks_until_all_jobs_finished():
assert state == JobState.DONE, (
f"Task {i} has state {state} after xp.wait(), expected DONE"
)


def test_experiment_failed_jobs_count():
"""The live experiment keeps the ``failed_jobs`` count of the interface
(used by the web UI and the remote server)"""
from experimaestro.scheduler.experiment import experiment
from experimaestro.scheduler.interfaces import BaseExperiment

assert (
isinstance(BaseExperiment.__dict__["failed_jobs"], property)
and "failed_jobs" not in experiment.__dict__
)
Loading