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:24:23 +0900
commiteb6d169033c73b80b943c281c6002761146f2393 (patch)
tree9df68bb55551e7fd71c9639cf4078ba88bcfe174
parentd4a6f14840a711b6b012598e0dae088d85ae22a6 (diff)
downloadbuildstream-eb6d169033c73b80b943c281c6002761146f2393.tar.gz
setup.cfg, tox.ini: Moved coverage support to the tox.ini level
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 ec20435ce..ca623aa4b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,7 @@ parentdir_prefix = BuildStream-
test=pytest
[tool:pytest]
-addopts = --verbose --basetemp ./tmp --cov=buildstream --cov-config .coveragerc --durations=20
+addopts = --verbose --basetemp ./tmp --durations=20
norecursedirs = tests/integration/project integration-cache tmp __pycache__ .eggs
python_files = tests/*/*.py
env =
diff --git a/tox.ini b/tox.ini
index 6fced4f51..a54dc55b1 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 =