jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci: optimize twisted/pexpect related jobs 

- tox: use twisted as dep only
- Azure: move twisted/numpy to main py37 job
- Travis: move twisted to main py37 build
This commit is contained in:
Daniel Hahler 2019-06-05 07:24:50 +02:00
parent 4f597f011d
commit 28aa38ece6
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -20,9 +20,6 @@ jobs:
include: include:
# OSX tests - first (in test stage), since they are the slower ones. # OSX tests - first (in test stage), since they are the slower ones.
- os: osx - os: osx
# NOTE: (tests with) pexpect appear to be buggy on Travis,
# at least with coverage.
# Log: https://travis-ci.org/pytest-dev/pytest/jobs/500358864
osx_image: xcode10.1 osx_image: xcode10.1
language: generic language: generic
env: TOXENV=py37-xdist PYTEST_COVERAGE=1 env: TOXENV=py37-xdist PYTEST_COVERAGE=1
@ -45,12 +42,12 @@ jobs:
# - TestArgComplete (linux only) # - TestArgComplete (linux only)
# - numpy # - numpy
# Empty PYTEST_ADDOPTS to run this non-verbose. # Empty PYTEST_ADDOPTS to run this non-verbose.
- env: TOXENV=py37-lsof-numpy-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS= - env: TOXENV=py37-lsof-numpy-twisted-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=
# Specialized factors for py37. # Specialized factors for py37.
# Coverage for: # Coverage for:
# - test_sys_breakpoint_interception (via pexpect). # - test_sys_breakpoint_interception (via pexpect).
- env: TOXENV=py37-pexpect,py37-twisted PYTEST_COVERAGE=1 - env: TOXENV=py37-pexpect PYTEST_COVERAGE=1
- env: TOXENV=py37-pluggymaster-xdist - env: TOXENV=py37-pluggymaster-xdist
- env: TOXENV=py37-freeze - env: TOXENV=py37-freeze

5
azure-pipelines.yml
View File

@ -28,7 +28,7 @@ jobs:
tox.env: 'py36-xdist' tox.env: 'py36-xdist'
py37: py37:
python.version: '3.7' python.version: '3.7'
tox.env: 'py37' tox.env: 'py37-twisted-numpy'
# Coverage for: # Coverage for:
# - _py36_windowsconsoleio_workaround (with py36+) # - _py36_windowsconsoleio_workaround (with py36+)
# - test_request_garbage (no xdist) # - test_request_garbage (no xdist)
@ -36,9 +36,6 @@ jobs:
py37-linting/docs/doctesting: py37-linting/docs/doctesting:
python.version: '3.7' python.version: '3.7'
tox.env: 'linting,docs,doctesting' tox.env: 'linting,docs,doctesting'
py37-twisted/numpy:
python.version: '3.7'
tox.env: 'py37-twisted,py37-numpy'
py37-pluggymaster-xdist: py37-pluggymaster-xdist:
python.version: '3.7' python.version: '3.7'
tox.env: 'py37-pluggymaster-xdist' tox.env: 'py37-pluggymaster-xdist'

5
tox.ini
View File

@ -23,7 +23,7 @@ commands =
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={env:_PYTEST_TOX_POSARGS_LSOF:} {env:_PYTEST_TOX_POSARGS_PEXPECT:} {env:_PYTEST_TOX_POSARGS_TWISTED:} {env:_PYTEST_TOX_POSARGS_XDIST:} _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_POSARGS_LSOF:} {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,9 +37,6 @@ setenv =
lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof lsof: _PYTEST_TOX_POSARGS_LSOF=--lsof
pexpect: _PYTEST_TOX_PLATFORM=linux|darwin pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
pexpect: _PYTEST_TOX_POSARGS_PEXPECT=-m uses_pexpect
twisted: _PYTEST_TOX_POSARGS_TWISTED=testing/test_unittest.py
xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
extras = testing extras = testing