From 6ddb4e2999eca7ad6182f78e2159dad317a7cd89 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Tue, 29 Jan 2019 01:08:29 -0800
Subject: [PATCH] No numprocesses in pytest.ini part 2 (#6715)

* Remove --numprocesses from pytest.ini.

* Add --numprocesses to PYTEST_ADDOPTS in tox.ini.

* complexity--
---
 pytest.ini | 1 -
 tox.ini    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index 8f009045c..654b368f2 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,7 +2,6 @@
 # settings we want to also change there must be added to the release script
 # directly.
 [pytest]
-addopts = --numprocesses auto --pyargs
 # In general, all warnings are treated as errors. Here are the exceptions:
 #   1- decodestring: https://github.com/rthalley/dnspython/issues/338
 #   2- ignore our own TLS-SNI-01 warning
diff --git a/tox.ini b/tox.ini
index 363f06bf2..76de2ea36 100644
--- a/tox.ini
+++ b/tox.ini
@@ -70,6 +70,7 @@ commands =
     {[base]install_and_test} {[base]all_packages}
     python tests/lock_test.py
 setenv =
+    PYTEST_ADDOPTS = {env:PYTEST_ADDOPTS:--numprocesses auto --pyargs}
     PYTHONHASHSEED = 0
 
 [testenv:py27-oldest]