diff --git a/setup.cfg b/setup.cfg index 45c983e0..aa108d06 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,3 +41,6 @@ exclude=build,lib,.tox,third,*.egg,docs,packages,.eggs # W605 skipped due to false positives ignore = E123,E125,H803,W503,W605 show-source = True + +[coverage:run] +parallel=true diff --git a/tests/assets/spec/reqcheck-excess/foo.spec b/tests/assets/spec/reqcheck-excess/foo.spec index 2c276b25..6738792d 100644 --- a/tests/assets/spec/reqcheck-excess/foo.spec +++ b/tests/assets/spec/reqcheck-excess/foo.spec @@ -6,9 +6,9 @@ %endif %global pyver_bin python%{pyver} -%global pyver_sitelib %python%{pyver}_sitelib -%global pyver_install %py%{pyver}_install -%global pyver_build %py%{pyver}_build +%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}} +%global pyver_install %{expand:%{py%{pyver}_install}} +%global pyver_build %{expand:%{py%{pyver}_build}} # End of macros for py2/py3 compatibility Name: foo diff --git a/tox.ini b/tox.ini index 93f661e2..6d5948ef 100644 --- a/tox.ini +++ b/tox.ini @@ -31,7 +31,7 @@ deps = pytest-cov coverage commands = - py.test --cov-append --cov rdopkg {posargs} + py.test --cov rdopkg {posargs} [testenv:py3-unit] deps = @@ -39,21 +39,21 @@ deps = pytest-cov coverage commands = - py.test --cov-append --cov rdopkg {posargs} + py.test --cov rdopkg {posargs} [testenv:py2-feature] deps = behave coverage commands = - coverage run -a --source='rdopkg' -m behave --format=progress + coverage run --source='rdopkg' -m behave --format=progress [testenv:py3-feature] deps = behave coverage commands = - coverage run -a --source='rdopkg' -m behave --format=progress + coverage run --source='rdopkg' -m behave --format=progress [testenv:py2-integration] commands = {toxinidir}/tests/integration/test_integration.sh @@ -63,11 +63,15 @@ commands = {toxinidir}/tests/integration/test_integration.sh [testenv:py2-cover] deps = coverage -commands = coverage html +commands = + coverage combine + coverage html [testenv:py3-cover] deps = coverage -commands = coverage html +commands = + coverage combine + coverage html [testenv:lint] deps = pycodestyle