floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4847 from blueyed/tox-posargs-lsof 

tox: split default posargs, use --lsof with single job only
This commit is contained in:
Daniel Hahler 2019-03-01 18:41:29 +01:00 committed by GitHub
parent 0dd4cb0f8f f8160f7bc5
commit 90031edde8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -65,7 +65,7 @@ jobs:
- stage: baseline - stage: baseline
env: TOXENV=py27-pexpect,py27-trial env: TOXENV=py27-pexpect,py27-trial
- env: TOXENV=py37-numpy-xdist - env: TOXENV=py37-lsof-numpy-xdist PYTEST_COVERAGE=1
- env: TOXENV=linting,docs,doctesting - env: TOXENV=linting,docs,doctesting
python: '3.7' python: '3.7'

12
tox.ini
View File

@ -21,12 +21,12 @@ envlist =
[testenv] [testenv]
commands = commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS}} {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
coverage: coverage combine coverage: coverage combine
coverage: coverage report coverage: coverage report
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS
setenv = setenv =
_PYTEST_TOX_DEFAULT_POSARGS=--lsof _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_XDIST:}
# Configuration to run with coverage similar to Travis/Appveyor, e.g. # Configuration to run with coverage similar to Travis/Appveyor, e.g.
# "tox -e py37-coverage". # "tox -e py37-coverage".
@ -37,10 +37,12 @@ setenv =
nobyte: PYTHONDONTWRITEBYTECODE=1 nobyte: PYTHONDONTWRITEBYTECODE=1
pexpect: _PYTEST_TOX_PLATFORM=linux|darwin lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
pexpect: _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_DEFAULT_POSARGS:testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py}
xdist: _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_DEFAULT_POSARGS:-n auto} pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
extras = testing extras = testing
deps = deps =
numpy: numpy numpy: numpy