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 fixture to return multiple compose files #11

Merged
merged 2 commits into from Aug 13, 2017
Merged

Allow fixture to return multiple compose files #11

merged 2 commits into from Aug 13, 2017

Commits on Aug 7, 2017

  1. Allow fixture to return multiple compose files 

    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.
    @gdetrez
    gdetrez committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    31eee04 View commit details
    Browse the repository at this point in the history

  2. Fix backward compatibility 

    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.
    @gdetrez
    gdetrez committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    e898132 View commit details
    Browse the repository at this point in the history