[buildstream] 02/05: setup.cfg, tox.ini: Moved coverage support to the tox.ini level

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch tristan/optional-coverage-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit c67b2a0a7d93a28b91e7a4baf6fe0593e60c8838
Author: Tristan Van Berkom <tr...@codethink.co.uk>
AuthorDate: Wed Feb 27 23:12:33 2019 +0900

    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
---
 setup.cfg | 2 +-
 tox.ini   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index ec20435..ca623aa 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 6fced4f..a54dc55 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 =