summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Pierre <benoit.pierre@gmail.com>2017-06-15 08:49:55 +0200
committerBenoit Pierre <benoit.pierre@gmail.com>2017-07-13 21:16:35 +0200
commitaa43b11bff2450296da9c41e705d03b5c28bf5bf (patch)
tree7bf31e1383656673e8e57b9a5d937aba5c621508
parent443e48d824c0dfd114dd6e92dc827159b2d5da52 (diff)
downloadpython-setuptools-git-aa43b11bff2450296da9c41e705d03b5c28bf5bf.tar.gz
tests: move py.test report arguments to pytest.ini
So it's possible to run tox with something like: `py.test -k test_unicode_filename_in_sdist`, and not loose the default report arguments.
-rwxr-xr-xpytest.ini2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/pytest.ini b/pytest.ini
index 11a213db..16fdc5af 100755
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,5 @@
[pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/test_pypi.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py --ignore pavement.py --ignore setuptools/tests/mod_with_constant.py -rsxX
norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern .*
flake8-ignore =
setuptools/site-patch.py F821
diff --git a/tox.ini b/tox.ini
index 98005fa2..4b4b4fd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,5 +7,5 @@
[testenv]
deps=-rtests/requirements.txt
passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR
-commands=py.test {posargs:-rsxX}
+commands=py.test {posargs}
usedevelop=True