Skip to content

fix: update wait_for_logs to not throw on 'created', and an optimization #719

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
alexanderankin merged 3 commits into from
Oct 24, 2024
Merged

fix: update wait_for_logs to not throw on 'created', and an optimization #719

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
deb6a6a
fix: update wait_for_logs to not throw on "created"
alexanderankin Oct 16, 2024
08bf23f
fix(core): Reload container in wait_for_logs before checking status
mschmitzer Oct 17, 2024
e2631d5
fix(core): Don't call "logs" twice in wait_for_logs
mschmitzer Oct 17, 2024
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
15 changes: 11 additions & 4 deletions core/testcontainers/core/waiting_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ def wait_for(condition: Callable[..., bool]) -> bool:
return condition()


_NOT_EXITED_STATUSES = {"running", "created"}


def wait_for_logs(
container: "DockerContainer",
predicate: Union[Callable, str],
Expand All @@ -103,11 +106,13 @@ def wait_for_logs(
"""
if isinstance(predicate, str):
predicate = re.compile(predicate, re.MULTILINE).search
wrapped = container.get_wrapped_container()
start = time.time()
while True:
duration = time.time() - start
stdout = container.get_logs()[0].decode()
stderr = container.get_logs()[1].decode()
stdout, stderr = container.get_logs()
stdout = stdout.decode()
stderr = stderr.decode()
predicate_result = (
predicate(stdout) or predicate(stderr)
if predicate_streams_and is False
Expand All @@ -118,6 +123,8 @@ def wait_for_logs(
return duration
if duration > timeout:
raise TimeoutError(f"Container did not emit logs satisfying predicate in {timeout:.3f} " "seconds")
if raise_on_exit and container.get_wrapped_container().status != "running":
raise RuntimeError("Container exited before emitting logs satisfying predicate")
if raise_on_exit:
wrapped.reload()
if wrapped.status not in _NOT_EXITED_STATUSES:
raise RuntimeError("Container exited before emitting logs satisfying predicate")
time.sleep(interval)