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
11 changes: 11 additions & 0 deletions clients/deadline.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ def elapsed(self) -> float:
"""Return seconds since start; uncapped, may exceed timeout."""
return self._clock.monotonic() - self._started_at

def fraction_used(self) -> float:
"""Return elapsed/timeout clamped to [0, 1]; timeout==0 yields 1.0."""
if self._timeout == 0:
return 1.0
ratio = self.elapsed() / self._timeout
if ratio < 0:
return 0.0
if ratio > 1:
return 1.0
return ratio

def remaining(self) -> float:
"""Return seconds left before the deadline (never negative)."""
elapsed = self._clock.monotonic() - self._started_at
Expand Down
11 changes: 11 additions & 0 deletions scenarios/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ def build_parser() -> argparse.ArgumentParser:
)

subparsers.add_parser("count", help="Print number of known scenarios")

has_parser = subparsers.add_parser(
"has", help="Check whether a scenario id is known"
)
has_parser.add_argument("scenario_id", help="Scenario id from the catalog")
return parser


Expand Down Expand Up @@ -173,6 +178,12 @@ def main(argv: list[str] | None = None) -> int:
print(len(known_scenario_ids()))
return 0

if args.command == "has":
if args.scenario_id in known_scenario_ids():
return 0
print(f"unknown scenario: {args.scenario_id}", file=sys.stderr)
return 1

return 1


Expand Down
15 changes: 14 additions & 1 deletion tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import io
import json
import unittest
from contextlib import redirect_stdout
from contextlib import redirect_stderr, redirect_stdout
from unittest.mock import patch

from scenarios.cli import main
Expand Down Expand Up @@ -223,5 +223,18 @@ def test_ids_text_format_default_unchanged(self):
self.assertEqual(lines, list(known_scenario_ids()))


def test_has_known_scenario_returns_zero(self):
code = main(["has", "retry"])
self.assertEqual(code, 0)

def test_has_unknown_scenario_returns_error(self):
err = io.StringIO()
with redirect_stderr(err):
code = main(["has", "missing"])
self.assertEqual(code, 1)
self.assertIn("unknown scenario: missing", err.getvalue())



if __name__ == "__main__":
unittest.main()
16 changes: 16 additions & 0 deletions tests/test_deadline.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,22 @@ def test_elapsed_tracks_fake_clock_uncapped(self):
self.assertAlmostEqual(deadline.elapsed(), 0.8)
self.assertGreater(deadline.elapsed(), 0.5)

def test_fraction_used_clamped_to_unit_interval(self):
clock = FakeClock()
deadline = Deadline(clock, timeout=1.0)
self.assertAlmostEqual(deadline.fraction_used(), 0.0)
clock.sleep(0.25)
self.assertAlmostEqual(deadline.fraction_used(), 0.25)
clock.sleep(0.75)
self.assertAlmostEqual(deadline.fraction_used(), 1.0)
clock.sleep(0.5)
self.assertAlmostEqual(deadline.fraction_used(), 1.0)

def test_fraction_used_zero_timeout_is_one(self):
clock = FakeClock()
deadline = Deadline(clock, timeout=0.0)
self.assertEqual(deadline.fraction_used(), 1.0)


if __name__ == "__main__":
unittest.main()
Loading