Skip to content

Commit

Permalink
Serialize coverage tests (certbot#3919)
Browse files Browse the repository at this point in the history
* Serialize coverage tests

* add py27_install env

* Separate cover from integration tests

* Add docker to py27 integration tests
  • Loading branch information
bmw authored and pde committed Dec 21, 2016
1 parent 28ce10f commit 00e143d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
14 changes: 8 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@ env:
matrix:
include:
- python: "2.7"
env: TOXENV=cover BOULDER_INTEGRATION=1
sudo: required
after_failure:
- sudo cat /var/log/mysql/error.log
- ps aux | grep mysql
services: docker
env: TOXENV=cover
- python: "2.7"
env: TOXENV=lint
- python: "2.7"
Expand All @@ -46,6 +41,13 @@ matrix:
- sudo cat /var/log/mysql/error.log
- ps aux | grep mysql
services: docker
- python: "2.7"
env: TOXENV=py27_install BOULDER_INTEGRATION=1
sudo: required
after_failure:
- sudo cat /var/log/mysql/error.log
- ps aux | grep mysql
services: docker
- sudo: required
env: TOXENV=apache_compat
services: docker
Expand Down
5 changes: 2 additions & 3 deletions tox.cover.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ cover () {
# specific package, positional argument scopes tests only to
# specific package directory; --cover-tests makes sure every tests
# is run (c.f. #403)
nosetests -c /dev/null --with-cover --cover-tests --cover-package \
"$1" --cover-min-percentage="$min" "$1" --processes=-1 \
--process-timeout=100
nosetests -c /dev/null --with-cover --cover-tests --cover-package \
"$1" --cover-min-percentage="$min" "$1"
}

rm -f .coverage # --cover-erase is off, make sure stats are correct
Expand Down
5 changes: 5 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ commands =
pip install -e .[dev]
nosetests -v certbot --processes=-1 --process-timeout=100

[testenv:py27_install]
basepython = python2.7
commands =
pip install -e acme[dns,dev] -e .[dev] -e certbot-apache -e certbot-nginx -e letshelp-certbot

[testenv:cover]
basepython = python2.7
commands =
Expand Down

0 comments on commit 00e143d

Please sign in to comment.