Skip to content

Commit 1281db7

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 1281db7

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ deps =
4040
mock
4141
nose
4242
commands =
43-
pytest -n3 -ra --runpytest=subprocess {posargs:testing}
43+
pytest -n auto -ra --runpytest=subprocess {posargs:testing}
4444

4545

4646
[testenv:linting]
@@ -58,7 +58,7 @@ deps =
5858
{env:_PYTEST_TOX_EXTRA_DEP:}
5959
changedir=testing
6060
commands =
61-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n8 -ra {posargs:.}
61+
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:.}
6262

6363
[testenv:py36-xdist]
6464
deps = {[testenv:py27-xdist]deps}
@@ -91,7 +91,7 @@ setenv =
9191
{[testenv]setenv}
9292
PYTHONDONTWRITEBYTECODE=1
9393
commands =
94-
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n3 -ra {posargs:.}
94+
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:.}
9595

9696
[testenv:py27-trial]
9797
deps =

0 commit comments

Comments
 (0)