p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3933 from nicoddemus/idval-hypothesis-flaky-3707 

Use -n auto now that xdist behaves well in Travis and AppVeyor
This commit is contained in:
Bruno Oliveira 2018-09-06 15:15:55 -03:00 committed by GitHub
parent 6b526cbe6a 5eb85efa14
commit c00d934b21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/python/metafunc.py
View File

@ -211,9 +211,6 @@ class TestMetafunc(object):
@hypothesis.settings(
deadline=400.0
) # 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):
from _pytest.python import _idval

9
tox.ini
View File

@ -40,8 +40,9 @@ deps =
pytest-xdist>=1.13
mock
nose
passenv = USER USERNAME TRAVIS
commands =
pytest -n3 -ra --runpytest=subprocess {posargs:testing}
pytest -n auto -ra --runpytest=subprocess {posargs:testing}
[testenv:linting]
@ -58,8 +59,9 @@ deps =
hypothesis>=3.56
{env:_PYTEST_TOX_EXTRA_DEP:}
whitelist_externals = env
passenv = USER USERNAME TRAVIS
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]
deps = {[testenv:py27-xdist]deps}
@ -93,8 +95,9 @@ setenv =
{[testenv]setenv}
PYTHONDONTWRITEBYTECODE=1
whitelist_externals = env
passenv = USER USERNAME TRAVIS
commands =
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n3 -ra {posargs:.}
{env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto -ra {posargs:.}
[testenv:py27-trial]
deps =