Move max-worker-restart to pytest-xdist options in tox.ini

This way py.test can be run on the outside without a
command line error.

Change-Id: Ia3689806bffbabe176a827cca2f099e89a60ebf5
Closes: #4989
(cherry picked from commit 3ceb87da1a66f455444e69ba25ac18ea26d8751e)

diff --git a/setup.cfg b/setup.cfg
index d711080e1be5bd7a580822acf2fb2d6dae8f0b05..e5e58c48b9a80d2ae1ee371072c1f79f73eddb40 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,7 +5,7 @@ tag_build = dev
 license_file = LICENSE
 
 [tool:pytest]
-addopts= --tb native -v -r sfxX --maxfail=25 -p no:warnings -p no:logging --max-worker-restart=5
+addopts= --tb native -v -r sfxX --maxfail=25 -p no:warnings -p no:logging
 python_files=test/*test_*.py
 
 [upload]

diff --git a/tox.ini b/tox.ini
index 7717bcd9c9a0b95684af04276e812436b0b10cc3..63274a325b6978f9a30a13e60251e2a781c01948 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -55,8 +55,8 @@ setenv=
     PYTHONNOUSERSITE=1
     BASECOMMAND=python -m pytest --log-info=sqlalchemy.testing
 
-    WORKERS={env:TOX_WORKERS:-n4}
-    oracle,oracle6,oracle5: WORKERS={env:TOX_WORKERS:-n2}
+    WORKERS={env:TOX_WORKERS:-n4  --max-worker-restart=5}
+    oracle,oracle6,oracle5: WORKERS={env:TOX_WORKERS:-n2  --max-worker-restart=5}
     nocext: DISABLE_SQLALCHEMY_CEXT=1
     cov: COVERAGE={[testenv]cov_args}
     sqlite: SQLITE={env:TOX_SQLITE:--db sqlite}