jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/569361 )

Change subject: Revert "[tests] `setup.py test` is being deprecated" ......................................................................

Revert "[tests] `setup.py test` is being deprecated"

This reverts commit 8538d0e6de66f7bcc7ef3527b868e34543db1376.

Change-Id: Idfbba7389ebca8ccb6aeae8758c2a048e46880ef --- M .appveyor.yml M .travis.yml M tests/README.rst M tox.ini 4 files changed, 9 insertions(+), 5 deletions(-)

Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified

diff --git a/.appveyor.yml b/.appveyor.yml index ab99715..fd2275b 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -106,7 +106,7 @@ - ps: "[IO.File]::AppendAllText($env:PYWIKIBOT_USER_CONFIG, 'max_retries = 2; maximum_GET_length = 5000; transliteration_target = None;')"

- set PYSETUP_TEST_NO_UI=1 - - "%CMD_IN_ENV% coverage run -m unittest -vv" + - "%CMD_IN_ENV% coverage run setup.py test"

on_finish: - codecov diff --git a/.travis.yml b/.travis.yml index a37c45c..00b7242 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,7 +108,7 @@ python setup.py pytest --addopts="-vvv -s --timeout=$TEST_TIMEOUT --cov=. -rsxX" ; fi else - coverage run -m unittest -vv ; + coverage run setup.py test ; fi

after_success: diff --git a/tests/README.rst b/tests/README.rst index d8935c7..56984ec 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -28,6 +28,10 @@

::

+ python setup.py test + +:: + python setup.py nosetests --tests tests

:: @@ -109,7 +113,7 @@

::

- PYWIKIBOT_TEST_MODULES=api,site python -m unittest -vv + PYWIKIBOT_TEST_MODULES=api,site python setup.py test

Travis CI @@ -195,7 +199,7 @@ 5. push changes into the forked git repository 6. watch the build at https://circleci.com/gh/<username>/pywikibot

-PYWIKIBOT_NO_USER_CONFIG=2 is needed because 'python -m unittest -vv' is run. +PYWIKIBOT_NO_USER_CONFIG=2 is needed because 'python setup.py test' is run.

TOXENV=py27,py34 is a workaround because CircleCI runs 'tox', but there is a bug in the CircleCI default 'py26' implementation. diff --git a/tox.ini b/tox.ini index 574a033..8a31790 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ usedevelop = True commands = flake8: flake8 --doctests {posargs} - test: python -m unittest -vv + test: python setup.py test

fasttest: python -W error::UserWarning -m generate_user_files -family:wikipedia -lang:test -v fasttest: nosetests --version