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.

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

Allow fixture to return multiple compose files #11

Merged
merged 2 commits into from Aug 13, 2017

Conversation

gdetrez
Copy link
Contributor

@gdetrez gdetrez commented Aug 7, 2017

As described in https://docs.docker.com/compose/extends/, docker compose
can be passed multiple compose files that are then merged. This change
allows the docker_compose_file fixture to make use of this by
returning e.g. a list or a tuple.

As described in https://docs.docker.com/compose/extends/, docker compose
can be passed multiple compose files that are then merged.  This change
allows the `docker_compose_file` fixture to make use of this by
returning e.g. a list or a tuple.
@coveralls
Copy link

coveralls commented Aug 7, 2017

Coverage Status

Coverage remained the same at 100.0% when pulling 31eee04 on gdetrez:multiple-compose-files into 643211e on AndreLouisCaron:master.

The previous solution was breaking backward compatibility when for
instance `docken_compose_file` was returning a `py.path` path (used by
pytest internally, e.g. for `pytestconfig.rootdir`).

This makes it more conservative and more backward compatible.
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling e898132 on gdetrez:multiple-compose-files into 643211e on AndreLouisCaron:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage remained the same at 100.0% when pulling e898132 on gdetrez:multiple-compose-files into 643211e on AndreLouisCaron:master.

@AndreLouisCaron AndreLouisCaron merged commit 958f037 into avast:master Aug 13, 2017
@AndreLouisCaron
Copy link
Contributor

Nice! Thanks for contributing this!

@AndreLouisCaron
Copy link
Contributor

Just released this on PyPI: https://pypi.org/project/pytest-docker/0.6.0/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants