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

diff --git a/setup.cfg b/setup.cfg
index 0b839852458db9f279503217609e9ccf04fa6cdf..9943bab01dc321624eee1019a07b9a560a48ae00 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 532c7200245acad47d3f1b15b9d7617b6cfebf15..1d418800e4d4a3972edb25b20fbd18b42ecee87d 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}