Skip to content

Commit 457b390

Browse files
committed
ci: tox/Travis: use pexpect for dep only
For #5306 I would have to add `testing/test_pytester.py` to the default pos args, but that would run all other tests therein additionally. This also adds pexpect tests to the MacOS job, which appears to have caused trouble at least in the past, and likely needs fixing here before this works.
1 parent fb4dd47 commit 457b390

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
language: generic
2929
# Coverage for:
3030
# - py2 with symlink in test_cmdline_python_package_symlink.
31-
env: TOXENV=py27-xdist PYTEST_COVERAGE=1
31+
# - _pytest.unittest._handle_skip (via pexpect).
32+
env: TOXENV=py27-pexpect-xdist PYTEST_COVERAGE=1
3233
before_install:
3334
- python -V
3435
- test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 27
@@ -62,8 +63,9 @@ jobs:
6263
# - pytester's LsofFdLeakChecker
6364
# - TestArgComplete (linux only)
6465
# - numpy
66+
# - test_sys_breakpoint_interception (via pexpect).
6567
# Empty PYTEST_ADDOPTS to run this non-verbose.
66-
- env: TOXENV=py37-lsof-numpy-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=
68+
- env: TOXENV=py37-lsof-numpy-pexpect-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=
6769

6870
# Specialized factors for py27.
6971
- env: TOXENV=py27-nobyte-numpy-xdist
@@ -72,9 +74,7 @@ jobs:
7274
python: '2.7'
7375

7476
# Specialized factors for py37.
75-
# Coverage for:
76-
# - test_sys_breakpoint_interception (via pexpect).
77-
- env: TOXENV=py37-pexpect,py37-twisted PYTEST_COVERAGE=1
77+
- env: TOXENV=py37-twisted PYTEST_COVERAGE=1
7878
- env: TOXENV=py37-pluggymaster-xdist
7979
- env: TOXENV=py37-freeze
8080

@@ -84,9 +84,7 @@ jobs:
8484
if: type = cron
8585

8686
- stage: baseline
87-
# Coverage for:
88-
# - _pytest.unittest._handle_skip (via pexpect).
89-
env: TOXENV=py27-pexpect,py27-twisted PYTEST_COVERAGE=1
87+
env: TOXENV=py27-twisted PYTEST_COVERAGE=1
9088
python: '2.7'
9189
# Use py36 here for faster baseline.
9290
- env: TOXENV=py36-xdist

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ commands =
2626
coverage: coverage report
2727
passenv = USER USERNAME COVERAGE_* TRAVIS PYTEST_ADDOPTS
2828
setenv =
29-
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:}
29+
_PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:}
3030

3131
# Configuration to run with coverage similar to Travis/Appveyor, e.g.
3232
# "tox -e py37-coverage".
@@ -40,7 +40,6 @@ setenv =
4040
lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
4141

4242
pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
43-
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
4443

4544
twisted: _PYTEST_TOX_POSARGS_TWISTED=testing/test_unittest.py
4645

0 commit comments

Comments
 (0)