Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix flakey tests #99

Merged
merged 2 commits into from
Jan 22, 2025
Merged

Fix flakey tests #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31bd582
Fix test_env in test that re-created it
Marenz Jan 21, 2025
30b99e1
Use dispatch-client version with flakey-tests fix
Marenz Jan 21, 2025
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies = [
# plugins.mkdocstrings.handlers.python.import)
"frequenz-sdk >= 1.0.0-rc1302, < 1.0.0-rc1500",
"frequenz-channels >= 1.3.0, < 2.0.0",
"frequenz-client-dispatch >= 0.8.2, < 0.9.0",
"frequenz-client-dispatch >= 0.8.4, < 0.9.0",
]
dynamic = ["version"]

Expand Down
22 changes: 18 additions & 4 deletions tests/test_frequenz_dispatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ async def test_dispatch_new_but_finished(
generator: DispatchGenerator,
fake_time: time_machine.Coordinates,
) -> None:
"""Test that a dispatch that is already finished is not started."""
"""Test that a finished dispatch is not started at startup."""
# Generate a dispatch that is already finished
finished_dispatch = generator.generate_dispatch()
finished_dispatch = replace(
Expand All @@ -437,10 +437,25 @@ async def test_dispatch_new_but_finished(
recurrence=RecurrenceRule(),
type="TEST_TYPE",
)
# Create an old dispatch
# Inject an old dispatch
test_env.client.set_dispatches(test_env.microgrid_id, [finished_dispatch])
await test_env.service.stop()
test_env.service.start()
test_env = replace(
test_env,
lifecycle_events=test_env.service.new_lifecycle_events_receiver("TEST_TYPE"),
running_state_change=(
await test_env.service.new_running_state_event_receiver(
"TEST_TYPE", unify_running_intervals=False
)
),
)

fake_time.shift(timedelta(seconds=1))
# Process the lifecycle event caused by the old dispatch at startup
await test_env.lifecycle_events.receive()

await asyncio.sleep(1)

# Create another dispatch the normal way
new_dispatch = generator.generate_dispatch()
Expand All @@ -452,8 +467,7 @@ async def test_dispatch_new_but_finished(
recurrence=RecurrenceRule(),
type="TEST_TYPE",
)
# Consume one lifecycle_updates event
await test_env.lifecycle_events.receive()

new_dispatch = await _test_new_dispatch_created(test_env, new_dispatch)

# Advance time to when the new dispatch should still not start
Expand Down
Loading