Merge pull request #1692 from bfirsh/coverage

Add test coverage support

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" \
   "$@"

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