Skip to content

Commit 8be29c1

Browse files
committed
Use -n auto now that xdist behaves well in Travis and AppVeyor
This hopefully fixes the flaky test_idval_hypothesis on AppVeyor Fix #3707
1 parent 15ede8a commit 8be29c1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

testing/python/metafunc.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,6 @@ class A(object):
211211
@hypothesis.settings(
212212
deadline=400.0
213213
) # very close to std deadline and CI boxes are not reliable in CPU power
214-
@pytest.mark.xfail(
215-
sys.platform.startswith("win32"), reason="flaky #3707", strict=False
216-
)
217214
def test_idval_hypothesis(self, value):
218215
from _pytest.python import _idval
219216

tox.ini

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ deps =
3939
pytest-xdist>=1.13
4040
mock
4141
nose
42+
passenv = USER USERNAME TRAVIS
4243
commands =
43-
pytest -n3 -ra --runpytest=subprocess {posargs:testing}
44+
pytest -n auto -ra --runpytest=subprocess {posargs:testing}
4445

4546

4647
[testenv:linting]
@@ -57,8 +58,9 @@ deps =
5758
hypothesis>=3.56
5859
{env:_PYTEST_TOX_EXTRA_DEP:}
5960
changedir=testing
61+
passenv = USER USERNAME TRAVIS
6062
commands =
61-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n8 -ra {posargs:.}
63+
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:.}
6264

6365
[testenv:py36-xdist]
6466
deps = {[testenv:py27-xdist]deps}
@@ -90,8 +92,9 @@ changedir=testing
9092
setenv =
9193
{[testenv]setenv}
9294
PYTHONDONTWRITEBYTECODE=1
95+
passenv = USER USERNAME TRAVIS
9396
commands =
94-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n3 -ra {posargs:.}
97+
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:.}
9598

9699
[testenv:py27-trial]
97100
deps =

0 commit comments

Comments
 (0)