summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-02-27 23:12:33 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2019-03-04 20:54:40 +0900
commit9feb7e4aafb25c01361ddb62a0175c12c08b27a8 (patch)
tree59e19f2b7685e9d49ef29507f6751a60f9776e48
parentb164c4b8e100934b35690f0de581aa9bf34027af (diff)
downloadbuildstream-tristan/optional-coverage-1.2.tar.gz
setup.cfg, tox.ini: Moved coverage support to the tox.ini leveltristan/optional-coverage-1.2
This disables any attempt to use coverage when running tests directly against installed dependencies with setup.py. This fixes #916
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index 159c665c3..545a6c89c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ parentdir_prefix = BuildStream-
test=pytest
[tool:pytest]
-addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --durations=20
+addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --durations=20
norecursedirs = integration-cache tmp __pycache__ .eggs
python_files = tests/*/*.py
pep8maxlinelength = 119
diff --git a/tox.ini b/tox.ini
index bfe68f88a..c48db7a4c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ skip_missing_interpreters = true
#
[testenv]
commands =
- pytest --basetemp {envtmpdir} {posargs}
+ pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs}
mkdir -p .coverage-reports
mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname}
deps =