X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/204f76e0c02a12aeccb3ab708fe41f7e95435a29..8d8b3d18059b7f11871eaa376c288f14549dd342:/tox.ini

diff --git a/tox.ini b/tox.ini
index cbb0f75..3ea4da8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,17 +1,23 @@
 [tox]
-envlist = py{36,37,38,39},fuzz
+envlist = {,ci-}py{36,37,38,39},fuzz
 
 [testenv]
 setenv = PYTHONPATH = {toxinidir}/src
 skip_install = True
 deps =
     -r{toxinidir}/test_requirements.txt
+; parallelization is disabled on CI because pytest-dev/pytest-xdist#620 occurs too frequently
+; local runs can stay parallelized since they aren't rolling the dice so many times as like on CI
 commands =
     pip install -e .[d]
     coverage erase
-    coverage run -m pytest tests -m "not python2" {posargs}
+    pytest tests --run-optional no_python2 \
+        !ci: --numprocesses auto \
+        --cov {posargs}
     pip install -e .[d,python2]
-    coverage run -m pytest tests -m "not without_python2" {posargs}
+    pytest tests --run-optional python2 \
+        !ci: --numprocesses auto \
+        --cov --cov-append {posargs}
     coverage report
 
 [testenv:fuzz]