From a4b181e93802f54b1bcaac9b3f657a959d86874b Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Tue, 14 Jan 2014 12:09:06 +1000 Subject: [PATCH] Extract common nosetest params into setup.cfg Arguments in setup.cfg will always be loaded as the default parameters when running nosetest --- Makefile | 4 ++-- setup.cfg | 6 ++++++ tox.ini | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 setup.cfg diff --git a/Makefile b/Makefile index f209561..a8bf505 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,11 @@ test: unit functional doctests unit: prepare @echo "Running unit tests ..." - @nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/unit --cover-package=httpretty + @nosetests -s tests/unit functional: prepare @echo "Running functional tests ..." - @nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/functional --cover-package=httpretty + @nosetests -s tests/functional doctests: prepare @echo "Running documentation tests tests ..." diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..77c6840 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,6 @@ +[nosetests] +verbosity=2 +with-coverage=1 +cover-erase=1 +cover-package=httpretty +cover-inclusive=1 diff --git a/tox.ini b/tox.ini index 15a7f72..f2a8bce 100644 --- a/tox.ini +++ b/tox.ini @@ -3,10 +3,10 @@ envlist = py26, py27 [testenv] deps = -r{toxinidir}/requirements.txt -commands = nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/unit --cover-package=httpretty +commands = nosetests -s tests/unit [testenv:functional] -commands = nosetests -s --verbosity=2 --with-coverage --cover-erase --cover-inclusive tests/functional --cover-package=httpretty +commands = nosetests -s tests/functional [testenv:pep8] deps = flake8