diff --git a/.dockerignore b/.dockerignore index a03616e53..b85b7e5d8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,3 +2,4 @@ build dist venv +coverage-html diff --git a/.gitignore b/.gitignore index da7fe7fa4..52a78bd97 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /docs/_site /venv docker-compose.spec +coverage-html diff --git a/requirements-dev.txt b/requirements-dev.txt index 7b529623f..c5d9c1064 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,3 +4,4 @@ git+https://github.com/pyinstaller/pyinstaller.git@12e40471c77f588ea5be352f7219c unittest2==0.8.0 flake8==2.3.0 pep8==1.6.1 +coverage==3.7.1 diff --git a/script/test b/script/test index 625af09b3..adf3fb1ba 100755 --- a/script/test +++ b/script/test @@ -5,6 +5,8 @@ set -ex TAG="docker-compose:$(git rev-parse --short HEAD)" +rm -rf coverage-html + docker build -t "$TAG" . docker run \ --rm \ @@ -12,6 +14,7 @@ docker run \ -e DOCKER_VERSIONS \ -e "TAG=$TAG" \ -e "affinity:image==$TAG" \ + -e "COVERAGE_DIR=$(pwd)/coverage-html" \ --entrypoint="script/test-versions" \ "$TAG" \ "$@" diff --git a/script/test-versions b/script/test-versions index 7f1a14a9b..9e81a515d 100755 --- a/script/test-versions +++ b/script/test-versions @@ -19,8 +19,9 @@ for version in $DOCKER_VERSIONS; do --rm \ --privileged \ --volume="/var/lib/docker" \ + --volume="${COVERAGE_DIR:-$(pwd)/coverage-html}:/code/coverage-html" \ -e "DOCKER_VERSION=$version" \ --entrypoint="script/dind" \ "$TAG" \ - script/wrapdocker nosetests "$@" + script/wrapdocker nosetests --with-coverage --cover-branches --cover-package=compose --cover-erase --cover-html-dir=coverage-html --cover-html "$@" done