From dfa37df4c057235f93f869cde99ef1b5feb33d7b Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 31 Aug 2016 16:05:13 -0700 Subject: [PATCH] tox.ini: remove extraneous coverage --omit option This option isn't eliminating anything in the runs I've seen, and it causes the coverage command (and thus 'make check') to fail spuriously if a parent directory contains 'test' or 'tox', since it filters out all of the coverage data. Signed-off-by: Josh Durgin --- src/ceph-detect-init/tox.ini | 2 +- src/ceph-disk/tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ceph-detect-init/tox.ini b/src/ceph-detect-init/tox.ini index 3da706586430..dd631a27d846 100644 --- a/src/ceph-detect-init/tox.ini +++ b/src/ceph-detect-init/tox.ini @@ -16,7 +16,7 @@ deps = -r{toxinidir}/test-requirements.txt commands = coverage run --source=ceph_detect_init {envbindir}/py.test -v tests - coverage report --omit=*test*,*tox* --show-missing --fail-under=100 + coverage report --show-missing --fail-under=100 [testenv:pep8] basepython = python2 diff --git a/src/ceph-disk/tox.ini b/src/ceph-disk/tox.ini index 786136e058f9..87c13bca691d 100644 --- a/src/ceph-disk/tox.ini +++ b/src/ceph-disk/tox.ini @@ -20,7 +20,7 @@ changedir = {env:CEPH_BUILD_DIR} commands = coverage run --append --source=ceph_disk {envbindir}/py.test -vv {toxinidir}/tests/test_main.py coverage run --append --source=ceph_disk {envbindir}/py.test -vv {toxinidir}/tests/test_prepare.py {toxinidir}/tests/ceph-disk.sh - coverage report --omit=*test*,*tox* --show-missing + coverage report --show-missing [testenv:flake8] commands = flake8 --ignore=H105,H405 ceph_disk tests -- 2.47.3