From 5eb85efa147457f4455dbb8080aa14ce784a3bdd Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Tue, 4 Sep 2018 18:58:00 -0300
Subject: [PATCH] Use -n auto now that xdist behaves well in Travis and
 AppVeyor

This hopefully fixes the flaky test_idval_hypothesis on AppVeyor

Fix #3707
---
 testing/python/metafunc.py | 3 ---
 tox.ini                    | 9 ++++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py
index f5d839f08..648c6c5c2 100644
--- a/testing/python/metafunc.py
+++ b/testing/python/metafunc.py
@@ -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
 
diff --git a/tox.ini b/tox.ini
index e16de404f..97fef426d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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 =