Skip to content

Commit 1d21a3a

Browse files
committed
tox: split default posargs in multiple env vars
This is required for combining. Use it for new lsof facor also.
1 parent e711a6c commit 1d21a3a

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

tox.ini

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ envlist =
2121

2222
[testenv]
2323
commands =
24-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS}}
24+
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:{env:_PYTEST_TOX_DEFAULT_POSARGS:}}
2525
coverage: coverage combine
2626
coverage: coverage report
2727
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS
2828
setenv =
29-
_PYTEST_TOX_DEFAULT_POSARGS=--lsof
29+
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_XDIST:}
3030

3131
# Configuration to run with coverage similar to Travis/Appveyor, e.g.
3232
# "tox -e py37-coverage".
@@ -35,10 +35,12 @@ setenv =
3535
coverage: COVERAGE_FILE={toxinidir}/.coverage
3636
coverage: COVERAGE_PROCESS_START={toxinidir}/.coveragerc
3737

38+
lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
39+
3840
pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
39-
pexpect: _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_DEFAULT_POSARGS:testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py}
41+
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
4042

41-
xdist: _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_DEFAULT_POSARGS:-n auto}
43+
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
4244
extras = testing
4345
deps =
4446
pexpect: pexpect

0 commit comments

Comments
 (0)