Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 12 additions & 27 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ celery = { version = "*" }
redis = { version = "*", optional = true }
python-memcached = { version = "*", optional = true }
python = ">=3.8,<4.0"
retry = ">=0.9.2"
funcy = ">=2.0"
pytest-docker-tools = ">=3.1.3"
docker = "^7.0.0"
psutil = ">=5.9.7"
Expand Down
4 changes: 2 additions & 2 deletions src/pytest_celery/api/container.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
from typing import Any

import pytest_docker_tools
from funcy import retry
from pytest_docker_tools import wrappers
from pytest_docker_tools.wrappers.container import wait_for_callable
from retry import retry


class CeleryTestContainer(wrappers.Container):
Expand Down Expand Up @@ -115,7 +115,7 @@ def _wait_port(self, port: str) -> int:
_, p = self.get_addr(port)
return p

@retry(pytest_docker_tools.exceptions.TimeoutError, delay=10, tries=3)
@retry(3, timeout=10, errors=pytest_docker_tools.exceptions.TimeoutError)
def _wait_ready(self, timeout: int = 30) -> bool:
"""Wait for the container to be ready by polling the logs for the
readiness prompt. If no prompt is set, the container is considered
Expand Down