From aefa89b8bda145fc6e6d9cda6a642d0ffc6db980 Mon Sep 17 00:00:00 2001 From: Roy Moore Date: Mon, 5 May 2025 15:12:36 +0000 Subject: [PATCH] fix(core): wait in test core registry --- core/tests/test_core_registry.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/tests/test_core_registry.py b/core/tests/test_core_registry.py index 384b06693..f0508df6e 100644 --- a/core/tests/test_core_registry.py +++ b/core/tests/test_core_registry.py @@ -15,7 +15,7 @@ from testcontainers.core.config import testcontainers_config from testcontainers.core.container import DockerContainer from testcontainers.core.docker_client import DockerClient -from testcontainers.core.waiting_utils import wait_container_is_ready +from testcontainers.core.waiting_utils import wait_for_logs from testcontainers.registry import DockerRegistryContainer @@ -38,18 +38,18 @@ def test_missing_on_private_registry(monkeypatch): with pytest.raises(NotFound): # Test a container with image from private registry with DockerContainer(f"{registry_url}/{image}:{tag}") as test_container: - wait_container_is_ready(test_container) + wait_for_logs(test_container, "Hello from Docker!") @pytest.mark.parametrize( - "image,tag,username,password", + "image,tag,username,password,expected_output", [ - ("nginx", "test", "user", "pass"), - ("hello-world", "latest", "new_user", "new_pass"), - ("alpine", "3.12", None, None), + ("nginx", "test", "user", "pass", "start worker processes"), + ("hello-world", "latest", "new_user", "new_pass", "Hello from Docker!"), + ("alpine", "3.12", None, None, ""), ], ) -def test_with_private_registry(image, tag, username, password, monkeypatch): +def test_with_private_registry(image, tag, username, password, expected_output, monkeypatch): client = DockerClient().client with DockerRegistryContainer(username=username, password=password) as registry: @@ -76,7 +76,7 @@ def test_with_private_registry(image, tag, username, password, monkeypatch): # Test a container with image from private registry with DockerContainer(f"{registry_url}/{image}:{tag}") as test_container: - wait_container_is_ready(test_container) + wait_for_logs(test_container, expected_output) # cleanup client.images.remove(f"{registry_url}/{image}:{tag}")