Skip to content

Commit 47a4b86

Browse files
committed
Update tests for time-machine 3.x API change (Coordinates -> Traveller)
Signed-off-by: Mathias L. Baumann <[email protected]>
1 parent f7d10bc commit 47a4b86

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

tests/test_frequenz_dispatch.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def event_loop_policy() -> async_solipsism.EventLoopPolicy:
4343

4444

4545
@fixture
46-
def fake_time() -> Iterator[time_machine.Coordinates]:
46+
def fake_time() -> Iterator[time_machine.Traveller]:
4747
"""Replace real time with a time machine that doesn't automatically tick."""
4848
# destination can be a datetime or a timestamp (int), so are moving to the
4949
# epoch (in UTC!)
@@ -165,7 +165,7 @@ async def _test_new_dispatch_created(
165165
async def test_existing_dispatch_updated(
166166
test_env: _TestEnv,
167167
generator: DispatchGenerator,
168-
fake_time: time_machine.Coordinates,
168+
fake_time: time_machine.Traveller,
169169
) -> None:
170170
"""Test that an existing dispatch is updated."""
171171
sample = generator.generate_dispatch()
@@ -203,7 +203,7 @@ async def test_existing_dispatch_updated(
203203
async def test_existing_dispatch_deleted(
204204
test_env: _TestEnv,
205205
generator: DispatchGenerator,
206-
fake_time: time_machine.Coordinates,
206+
fake_time: time_machine.Traveller,
207207
) -> None:
208208
"""Test that an existing dispatch is deleted."""
209209
sample = await _test_new_dispatch_created(test_env, generator.generate_dispatch())
@@ -226,7 +226,7 @@ async def test_existing_dispatch_deleted(
226226
async def test_dispatch_inf_duration_deleted(
227227
test_env: _TestEnv,
228228
generator: DispatchGenerator,
229-
fake_time: time_machine.Coordinates,
229+
fake_time: time_machine.Traveller,
230230
) -> None:
231231
"""Test that a dispatch with infinite duration can be deleted while running."""
232232
# Generate a dispatch with infinite duration (duration=None)
@@ -261,7 +261,7 @@ async def test_dispatch_inf_duration_deleted(
261261
async def test_dispatch_inf_duration_updated_stopped_started(
262262
test_env: _TestEnv,
263263
generator: DispatchGenerator,
264-
fake_time: time_machine.Coordinates,
264+
fake_time: time_machine.Traveller,
265265
) -> None:
266266
"""Test that a dispatch with infinite duration can be stopped and started by updating it."""
267267
# Generate a dispatch with infinite duration (duration=None)
@@ -310,7 +310,7 @@ async def test_dispatch_inf_duration_updated_stopped_started(
310310
async def test_dispatch_inf_duration_updated_to_finite_and_stops(
311311
test_env: _TestEnv,
312312
generator: DispatchGenerator,
313-
fake_time: time_machine.Coordinates,
313+
fake_time: time_machine.Traveller,
314314
) -> None:
315315
"""Test updating an inf. duration changing to finite.
316316
@@ -353,7 +353,7 @@ async def test_dispatch_inf_duration_updated_to_finite_and_stops(
353353
async def test_dispatch_schedule(
354354
test_env: _TestEnv,
355355
generator: DispatchGenerator,
356-
fake_time: time_machine.Coordinates,
356+
fake_time: time_machine.Traveller,
357357
) -> None:
358358
"""Test that a random dispatch is scheduled correctly."""
359359
sample = replace(
@@ -400,7 +400,7 @@ async def test_dispatch_schedule(
400400
async def test_dispatch_inf_duration_updated_to_finite_and_continues(
401401
test_env: _TestEnv,
402402
generator: DispatchGenerator,
403-
fake_time: time_machine.Coordinates,
403+
fake_time: time_machine.Traveller,
404404
) -> None:
405405
"""Test that updating an infinite duration dispatch to a finite duration.
406406
@@ -447,7 +447,7 @@ async def test_dispatch_inf_duration_updated_to_finite_and_continues(
447447
async def test_dispatch_new_but_finished(
448448
test_env: _TestEnv,
449449
generator: DispatchGenerator,
450-
fake_time: time_machine.Coordinates,
450+
fake_time: time_machine.Traveller,
451451
) -> None:
452452
"""Test that a finished dispatch is not started at startup."""
453453
# Generate a dispatch that is already finished
@@ -503,7 +503,7 @@ async def test_dispatch_new_but_finished(
503503
async def test_notification_on_actor_start(
504504
test_env: _TestEnv,
505505
generator: DispatchGenerator,
506-
fake_time: time_machine.Coordinates,
506+
fake_time: time_machine.Traveller,
507507
) -> None:
508508
"""Test that the actor sends notifications for all running dispatches on start."""
509509
# Generate a dispatch that is already running
@@ -545,7 +545,7 @@ async def test_notification_on_actor_start(
545545
async def test_notification_on_actor_start_inf_duration(
546546
test_env: _TestEnv,
547547
generator: DispatchGenerator,
548-
fake_time: time_machine.Coordinates,
548+
fake_time: time_machine.Traveller,
549549
) -> None:
550550
"""Test that the actor sends notifications for indefinite dispatches on start."""
551551
# Generate a dispatch that is already running
@@ -586,7 +586,7 @@ async def test_notification_on_actor_start_inf_duration(
586586

587587
@pytest.mark.parametrize("merge_strategy", [MergeByType(), MergeByTypeTarget()])
588588
async def test_multiple_dispatches_merge_running_intervals(
589-
fake_time: time_machine.Coordinates,
589+
fake_time: time_machine.Traveller,
590590
generator: DispatchGenerator,
591591
merge_strategy: MergeStrategy,
592592
) -> None:
@@ -664,7 +664,7 @@ async def test_multiple_dispatches_merge_running_intervals(
664664

665665
@pytest.mark.parametrize("merge_strategy", [MergeByType(), MergeByTypeTarget()])
666666
async def test_multiple_dispatches_sequential_intervals_merge(
667-
fake_time: time_machine.Coordinates,
667+
fake_time: time_machine.Traveller,
668668
generator: DispatchGenerator,
669669
merge_strategy: MergeStrategy,
670670
) -> None:
@@ -734,7 +734,7 @@ async def test_multiple_dispatches_sequential_intervals_merge(
734734

735735
@pytest.mark.parametrize("merge_strategy", [MergeByType(), MergeByTypeTarget()])
736736
async def test_at_least_one_running_filter(
737-
fake_time: time_machine.Coordinates,
737+
fake_time: time_machine.Traveller,
738738
generator: DispatchGenerator,
739739
merge_strategy: MergeStrategy,
740740
) -> None:
@@ -831,7 +831,7 @@ async def test_at_least_one_running_filter(
831831
],
832832
)
833833
async def test_dry_run_dispatches_not_merged(
834-
fake_time: time_machine.Coordinates,
834+
fake_time: time_machine.Traveller,
835835
generator: DispatchGenerator,
836836
merge_strategy: MergeStrategy,
837837
) -> None:

tests/test_managing_actor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def event_loop_policy() -> async_solipsism.EventLoopPolicy:
5252

5353

5454
@fixture
55-
def fake_time() -> Iterator[time_machine.Coordinates]:
55+
def fake_time() -> Iterator[time_machine.Traveller]:
5656
"""Replace real time with a time machine that doesn't automatically tick."""
5757
# destination can be a datetime or a timestamp (int), so are moving to the
5858
# epoch (in UTC!)
@@ -147,7 +147,7 @@ async def test_env() -> AsyncIterator[_TestEnv]:
147147

148148
async def test_simple_start_stop(
149149
test_env: _TestEnv,
150-
fake_time: time_machine.Coordinates,
150+
fake_time: time_machine.Traveller,
151151
) -> None:
152152
"""Test behavior when receiving start/stop messages."""
153153
now = _now()
@@ -194,7 +194,7 @@ async def test_simple_start_stop(
194194

195195

196196
async def test_start_failed(
197-
test_env: _TestEnv, fake_time: time_machine.Coordinates
197+
test_env: _TestEnv, fake_time: time_machine.Traveller
198198
) -> None:
199199
"""Test auto-retry after 60 seconds."""
200200
# pylint: disable=protected-access
@@ -283,7 +283,7 @@ def test_heapq_dispatch_start_stop_compare(test_env: _TestEnv) -> None:
283283
assert scheduled_events[1].dispatch_id == dispatch2.id
284284

285285

286-
async def test_dry_run(test_env: _TestEnv, fake_time: time_machine.Coordinates) -> None:
286+
async def test_dry_run(test_env: _TestEnv, fake_time: time_machine.Traveller) -> None:
287287
"""Test the dry run mode."""
288288
dispatch = test_env.generator.generate_dispatch()
289289
dispatch = replace(
@@ -321,7 +321,7 @@ async def test_dry_run(test_env: _TestEnv, fake_time: time_machine.Coordinates)
321321

322322
@pytest.mark.parametrize("strategy", [MergeByTypeTarget(), MergeByType(), None])
323323
async def test_manage_abstraction(
324-
fake_time: time_machine.Coordinates,
324+
fake_time: time_machine.Traveller,
325325
generator: DispatchGenerator,
326326
strategy: MergeStrategy | None,
327327
) -> None:
@@ -417,7 +417,7 @@ async def new_mock_receiver(
417417

418418
async def test_actor_dispatcher_update_isolation(
419419
test_env: _TestEnv,
420-
fake_time: time_machine.Coordinates,
420+
fake_time: time_machine.Traveller,
421421
) -> None:
422422
"""Test that updates for one dispatch don't affect other actors of the same type."""
423423
dispatch_type = "ISOLATION_TEST"

0 commit comments

Comments
 (0)