Skip to content

refactor: drop the _sleep_once fixture #122

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

Merged
tonyandrewmeyer merged 2 commits into from
Sep 10, 2026
Merged

refactor: drop the _sleep_once fixture #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
507e123
Fix #107: Drop redundant _sleep_once fixture
tonyandrewmeyer Sep 6, 2026
94bddbd
Merge branch 'main' into rainy/107-drop-sleep-once-fixture
tonyandrewmeyer Sep 7, 2026
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
23 changes: 1 addition & 22 deletions pytest_jubilant/_main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
import pytest

if typing.TYPE_CHECKING:
from collections.abc import Callable

from _pytest.terminal import TerminalReporter

logger = logging.getLogger("pytest-jubilant")
Expand Down Expand Up @@ -296,28 +294,9 @@ def _model_prefix(request: pytest.FixtureRequest) -> str: # pyright: ignore[rep
return prefix


@pytest.fixture(scope="module")
def _sleep_once(): # pyright: ignore[reportUnusedFunction]
"""Return a function that sleeps when called for the first time.

The returned function does nothing on repeated calls.
This allows fixtures of the same scope to ensure a single sleep happens before teardown.
"""
slept = False

def sleep():
nonlocal slept
if not slept:
time.sleep(_LOG_WAIT)
slept = True

return sleep


@pytest.fixture(scope="module")
def juju_factory(
request: pytest.FixtureRequest,
_sleep_once: Callable[[], None],
_model_prefix: str,
):
"""Module-scoped factory for creating one or more temporary Juju models.
Expand All @@ -344,7 +323,7 @@ def juju_factory(

# BEFORE tearing down the models, dump any and all juju debug-logs
if dump_logs:
_sleep_once() # Wait for Juju to process logs or the latest lines might be missing
time.sleep(_LOG_WAIT) # Wait for Juju to process logs or the latest lines might be missing
factory._dump_all_logs() # pyright: ignore[reportPrivateUsage]

if not request.config.getoption("--no-juju-teardown"):
Expand Down