almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix reporting of coverage results to coverall.io

Browse Source 
When I re-arranged the test-in-docker I didn't realize how .travis.yml
was extracting the results. This should fix it.

When running with test-in-docker we mount the source read-only on
/linux-ro/ inside the container and copy it over to /lorax/ for running
the tests.

The local directory ./.test-results/ is mounted on /test-results/ in the
container and the .coverage file is copied into there so that it is
available on the host.

(cherry picked from commit b61a91954a)
This commit is contained in:
Brian C. Lane 2018-11-13 17:06:40 -08:00
parent 3fd9699e6d
commit a0a76a800a
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ __pycache__/
.coverage .coverage
pylint-log pylint-log
.pytest_cache/ .pytest_cache/
.test-results/

4
.travis.yml
View File

@ -9,9 +9,7 @@ script:
after_success: after_success:
- | - |
sudo docker create --name results-cont welder/lorax /bin/echo cp .test-results/.coverage ./.coverage.docker
sudo docker cp results-cont:/lorax/.coverage .coverage.docker
sudo docker rm results-cont
pip install coverage coveralls pip install coverage coveralls
coverage combine coverage combine

5
Dockerfile.test
View File

@ -32,5 +32,6 @@ RUN dnf -y install \
which && \ which && \
touch /.in-container touch /.in-container
RUN useradd weldr RUN useradd weldr
VOLUME /lorax VOLUME /lorax-ro
WORKDIR /lorax VOLUME /test-results
WORKDIR /lorax-ro

7
Makefile
View File

@ -77,12 +77,13 @@ local:
@echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz" @echo "The archive is in $(PKGNAME)-$(VERSION).tar.gz"
test-in-copy: test-in-copy:
rsync -aP --exclude=.git /lorax/ /lorax-test/ rsync -aP --exclude=.git /lorax-ro/ /lorax/
make -C /lorax-test/ check test make -C /lorax/ check test
cp /lorax/.coverage /test-results/
test-in-docker: test-in-docker:
sudo $(DOCKER) build -t welder/lorax-tests:$(IMAGE_RELEASE) -f Dockerfile.test . sudo $(DOCKER) build -t welder/lorax-tests:$(IMAGE_RELEASE) -f Dockerfile.test .
sudo $(DOCKER) run --rm -it -v `pwd`:/lorax:ro --security-opt label=disable welder/lorax-tests:$(IMAGE_RELEASE) make test-in-copy sudo $(DOCKER) run --rm -it -v `pwd`/.test-results/:/test-results -v `pwd`:/lorax-ro:ro --security-opt label=disable welder/lorax-tests:$(IMAGE_RELEASE) make test-in-copy
docs-in-docker: docs-in-docker:
sudo $(DOCKER) run -it --rm -v `pwd`/docs/html/:/lorax/docs/html/ --security-opt label=disable welder/lorax-tests:$(IMAGE_RELEASE) make docs sudo $(DOCKER) run -it --rm -v `pwd`/docs/html/:/lorax/docs/html/ --security-opt label=disable welder/lorax-tests:$(IMAGE_RELEASE) make docs