Use -n auto now that xdist behaves well in Travis and AppVeyor
This hopefully fixes the flaky test_idval_hypothesis on AppVeyor Fix #3707
This commit is contained in:
parent
e0466d0ad8
commit
5eb85efa14
|
@ -211,9 +211,6 @@ class TestMetafunc(object):
|
||||||
@hypothesis.settings(
|
@hypothesis.settings(
|
||||||
deadline=400.0
|
deadline=400.0
|
||||||
) # very close to std deadline and CI boxes are not reliable in CPU power
|
) # very close to std deadline and CI boxes are not reliable in CPU power
|
||||||
@pytest.mark.xfail(
|
|
||||||
sys.platform.startswith("win32"), reason="flaky #3707", strict=False
|
|
||||||
)
|
|
||||||
def test_idval_hypothesis(self, value):
|
def test_idval_hypothesis(self, value):
|
||||||
from _pytest.python import _idval
|
from _pytest.python import _idval
|
||||||
|
|
||||||
|
|
9
tox.ini
9
tox.ini
|
@ -40,8 +40,9 @@ deps =
|
||||||
pytest-xdist>=1.13
|
pytest-xdist>=1.13
|
||||||
mock
|
mock
|
||||||
nose
|
nose
|
||||||
|
passenv = USER USERNAME TRAVIS
|
||||||
commands =
|
commands =
|
||||||
pytest -n3 -ra --runpytest=subprocess {posargs:testing}
|
pytest -n auto -ra --runpytest=subprocess {posargs:testing}
|
||||||
|
|
||||||
|
|
||||||
[testenv:linting]
|
[testenv:linting]
|
||||||
|
@ -58,8 +59,9 @@ deps =
|
||||||
hypothesis>=3.56
|
hypothesis>=3.56
|
||||||
{env:_PYTEST_TOX_EXTRA_DEP:}
|
{env:_PYTEST_TOX_EXTRA_DEP:}
|
||||||
whitelist_externals = env
|
whitelist_externals = env
|
||||||
|
passenv = USER USERNAME TRAVIS
|
||||||
commands =
|
commands =
|
||||||
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n8 -ra {posargs:testing}
|
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:testing}
|
||||||
|
|
||||||
[testenv:py36-xdist]
|
[testenv:py36-xdist]
|
||||||
deps = {[testenv:py27-xdist]deps}
|
deps = {[testenv:py27-xdist]deps}
|
||||||
|
@ -93,8 +95,9 @@ setenv =
|
||||||
{[testenv]setenv}
|
{[testenv]setenv}
|
||||||
PYTHONDONTWRITEBYTECODE=1
|
PYTHONDONTWRITEBYTECODE=1
|
||||||
whitelist_externals = env
|
whitelist_externals = env
|
||||||
|
passenv = USER USERNAME TRAVIS
|
||||||
commands =
|
commands =
|
||||||
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n3 -ra {posargs:.}
|
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:.}
|
||||||
|
|
||||||
[testenv:py27-trial]
|
[testenv:py27-trial]
|
||||||
deps =
|
deps =
|
||||||
|
|
Loading…
Reference in New Issue