Skip to content

Commit

Permalink
Fix coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
juga0 committed Jun 3, 2017
1 parent 94a838c commit 55d7190
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ before_install:

install:
- pip install -U tox
- pip install -U coveralls
# && pip install -r dev-requirements.txt"
env:
- TOX_ENV=style
Expand All @@ -18,8 +19,8 @@ env:
- TOX_ENV=doc

script:
- cd dhcpcanon
- tox -c tox.ini -e $TOX_ENV tests/
- tox -c tox.ini -e $TOX_ENV
- coverage run --source=dhcpcanon setup.py test

after_success:
- coveralls
Expand Down
14 changes: 4 additions & 10 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ commands=
[testenv]
whitelist_externals = sh
changedir=tests
passenv = *
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
deps =
coveralls
coverage
Expand All @@ -43,18 +43,12 @@ commands =
sh -c "which coverage"
python -V
pip --version
pinned: pip install --ignore-installed -r {toxinidir}/requirements.txt

python -c "import setuptools; print('setuptools-%s' % setuptools.__version__)"
coverage --version

coverage run --rcfile={toxinidir}/.coveragerc --source=dhcpcanon -m pytest -vs {toxinidir}/tests

# pytest {posargs:}
setenv =
COVERAGE_PROCESS_START = {toxinidir}/.coveragerc
COVERAGE_FILE = {toxinidir}/.coverage
{py27,py35}: CB_FULLTESTS = 1
coverage run --source=dhcpcanon setup.py test
coveralls
pytest

[testenv:doc]
deps =
Expand Down

0 comments on commit 55d7190

Please sign in to comment.