Skip to content
Merged
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
5 changes: 4 additions & 1 deletion src/osekit/utils/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@ def walltime(self) -> Timedelta:
@property
def walltime_str(self) -> str:
"""String representation of the ``walltime``."""
return str(self.walltime).split("days")[-1].strip()
total_seconds = self.walltime.total_seconds()
hours, remainder = divmod(total_seconds, 3600)
minutes, seconds = divmod(remainder, 60)
return ":".join(f"{t:02}" for t in map(int, (hours, minutes, seconds)))

@walltime.setter
def walltime(self, walltime: str | Timedelta) -> None:
Expand Down
34 changes: 34 additions & 0 deletions tests/test_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -645,3 +645,37 @@ def test_build_dependency_string_with_different_types(
"""Test building dependency strings with different dependency types."""
with expected as e:
assert Job._build_dependency_string("1234567", dependency_type) == e


@pytest.mark.parametrize(
"walltime",
[
pytest.param(
"01:00:00",
id="hours_only_str",
),
pytest.param(
"01:24:32",
id="hours_minutes_seconds_str",
),
pytest.param(
"30:12:10",
id="more_than_a_day_str",
),
pytest.param(
Timedelta(hours=1, minutes=0, seconds=0),
id="hours_only_timedelta",
),
pytest.param(
Timedelta(hours=1, minutes=24, seconds=32),
id="hours_minutes_seconds_timedelta",
),
pytest.param(
Timedelta(hours=30, minutes=12, seconds=10),
id="more_than_a_day_timedelta",
),
],
)
def test_job_walltime(walltime: str | Timedelta) -> None:
job = Job(Path(), config=JobConfig(walltime=walltime))
assert Timedelta(job.walltime_str) == Timedelta(walltime)