Skip to content

Use -n auto now that xdist behaves well in Travis and AppVeyor #3933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicoddemus merged 1 commit into from
Sep 6, 2018
Merged

Use -n auto now that xdist behaves well in Travis and AppVeyor #3933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions testing/python/metafunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,6 @@ class A(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

Expand Down
9 changes: 6 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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}
Expand Down Expand Up @@ -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 =
Expand Down