Skip to content

Commit 7428064

Browse files
authored
Merge pull request #4836 from blueyed/travis-pluggymaster-xdist
ci: xdist with pluggymaster
2 parents af706ed + 4eb40ef commit 7428064

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ env:
1616
# Specialized factors for py27.
1717
- TOXENV=py27-nobyte
1818
- TOXENV=py27-xdist
19-
- TOXENV=py27-pluggymaster
19+
- TOXENV=py27-pluggymaster-xdist
2020
# Specialized factors for py37.
2121
- TOXENV=py37-pexpect,py37-trial,py37-numpy
22-
- TOXENV=py37-pluggymaster
22+
- TOXENV=py37-pluggymaster-xdist
2323
- TOXENV=py37-freeze PYTEST_NO_COVERAGE=1
2424

2525
matrix:

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ environment:
66
- TOXENV: "py34-xdist"
77
- TOXENV: "py35-xdist"
88
- TOXENV: "py36-xdist"
9+
# NOTE: pypy-xdist is buggy currently (https://github.com/pytest-dev/pytest-xdist/issues/142).
910
- TOXENV: "pypy"
1011
PYTEST_NO_COVERAGE: "1"
1112
# Specialized factors for py27.
1213
- TOXENV: "py27-trial,py27-numpy,py27-nobyte"
13-
- TOXENV: "py27-pluggymaster"
1414
# Specialized factors for py37.
1515
- TOXENV: "py37-trial,py37-numpy"
16-
- TOXENV: "py37-pluggymaster"
1716
- TOXENV: "py37-freeze"
1817
PYTEST_NO_COVERAGE: "1"
1918

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
python.version: '2.7'
2828
tox.env: 'py27-trial'
2929
python.needs_vc: True
30-
py27-pluggymaster:
30+
py27-pluggymaster-xdist:
3131
python.version: '2.7'
32-
tox.env: 'pluggymaster'
32+
tox.env: 'py27-pluggymaster-xdist'
3333
pypy:
3434
python.version: 'pypy'
3535
tox.env: 'pypy'
@@ -55,9 +55,9 @@ jobs:
5555
py37-trial/numpy:
5656
python.version: '3.7'
5757
tox.env: 'py37-trial,py37-numpy'
58-
py37-pluggymaster:
58+
py37-pluggymaster-xdist:
5959
python.version: '3.7'
60-
tox.env: 'py37-pluggymaster'
60+
tox.env: 'py37-pluggymaster-xdist'
6161
maxParallel: 10
6262

6363
steps:

0 commit comments

Comments
 (0)