Xqt merged this change.

View Change

tox: rename envs used by Jenkins

Wikimedia Jenkins invokes the tox environments 'nose' and 'nose34'. The
names are bound to the underlying test command and I would like to
replace nosetests with pytest.

Rename the virtualenvs, make sure to use the python version in the name:

nose > fasttest-py27
nose34 > fasttest-py34

Change-Id: I1c997484ac8b9ba99d986ac09555744fb437590e
---
M tox.ini
1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/tox.ini b/tox.ini
index 2be7dac..cf455ad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,9 +29,24 @@
 commands =
     flake8: flake8 --doctests {posargs}
     test: python setup.py test
+
+    fasttest: python -W error::UserWarning -m generate_user_files -family:test -lang:test -v
+    fasttest: nosetests --version
+    fasttest: nosetests --with-detecthttp -v -a '!net' tests
 deps =
     flake8: .[flake8]
 
+    fasttest: nose
+    fasttest: mock
+
+    fasttest-py27: nose-detecthttp
+    fasttest-py27: unicodecsv
+
+    fasttest-py34: mwparserfromhell
+    fasttest-py34: beautifulsoup4
+    fasttest-py34: nose-detecthttp>=0.1.3
+    fasttest-py34: six
+
 [testenv:diff-checker]
 deps = unidiff
 commands = python scripts/maintenance/diff_checker.py
@@ -40,30 +55,6 @@
 deps = commit-message-validator
 commands = commit-message-validator
 
-[testenv:nose]
-commands =
-    python -W error::UserWarning -m generate_user_files -family:test -lang:test -v
-    nosetests --version
-    nosetests --with-detecthttp -v -a '!net' tests
-deps =
-    nose
-    nose-detecthttp
-    unicodecsv
-    mock
-
-[testenv:nose34]
-basepython = python3
-commands =
-    python -W error::UserWarning -m generate_user_files -family:test -lang:test -v
-    nosetests --version
-    nosetests --with-detecthttp -v -a '!net' tests
-deps =
-    mwparserfromhell
-    beautifulsoup4
-    nose
-    nose-detecthttp>=0.1.3
-    six
-    mock
 
 [testenv:doctest]
 commands =

To view, visit change 495814. To unsubscribe, or for help writing mail filters, visit settings.