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

Jump to bottom

allow docker_compose_files to be a list #108

Merged
merged 1 commit into from
Feb 2, 2024
Merged

allow docker_compose_files to be a list #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/pytest_docker/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def docker_compose_command() -> str:


@pytest.fixture(scope=containers_scope)
def docker_compose_file(pytestconfig: Any) -> str:
def docker_compose_file(pytestconfig: Any) -> Union[List[str], str]:
"""Get an absolute path to the `docker-compose.yml` file. Override this
fixture in your tests if you need a custom location."""

Expand Down Expand Up @@ -194,7 +194,7 @@ def docker_setup() -> Union[List[str], str]:
@contextlib.contextmanager
def get_docker_services(
docker_compose_command: str,
docker_compose_file: str,
docker_compose_file: Union[List[str], str],
docker_compose_project_name: str,
docker_setup: Union[List[str], str],
docker_cleanup: Union[List[str], str],
Expand Down Expand Up @@ -227,7 +227,7 @@ def get_docker_services(
@pytest.fixture(scope=containers_scope)
def docker_services(
docker_compose_command: str,
docker_compose_file: str,
docker_compose_file: Union[List[str], str],
docker_compose_project_name: str,
docker_setup: str,
docker_cleanup: str,
Expand Down
Loading