From 571a050fd2392611b7fc1699ccbabb756812443d Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 27 Mar 2013 10:28:45 +0400 Subject: [PATCH] Tools has been improved. openstack.nose_plugin is now used instead of test_lib tox runs tools/run_XXX commands commands unified to be used with tox or directly Change-Id: I7549408937ca43f4731ebbe7c52419c2577335be --- setup.cfg | 2 +- tox.ini | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/setup.cfg b/setup.cfg index 7e50208..89c49a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,6 +8,6 @@ cover-package=savanna cover-html=true cover-erase=true cover-inclusive=true -verbosity=2 +verbosity=3 detailed-errors=1 where=savanna/tests diff --git a/tox.ini b/tox.ini index aa80aff..7b07994 100644 --- a/tox.ini +++ b/tox.ini @@ -3,32 +3,24 @@ envlist = py26,py27,pep8,pyflakes [testenv] setenv = VIRTUAL_ENV={envdir} - NOSE_WITH_OPENSTACK=1 - NOSE_OPENSTACK_COLOR=1 - NOSE_OPENSTACK_RED=0.05 - NOSE_OPENSTACK_YELLOW=0.025 - NOSE_OPENSTACK_SHOW_ELAPSED=1 - NOSE_OPENSTACK_STDOUT=1 deps = -r{toxinidir}/tools/pip-requires -r{toxinidir}/tools/test-requires -commands = nosetests {posargs} +commands = bash tools/run_tests {posargs} [tox:jenkins] downloadcache = ~/cache/pip [testenv:pep8] deps = pep8>=1.3.3 -commands = - pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,test,resources,tools . - pep8 --repeat --show-pep8 --show-source --filename=savanna* bin +commands = bash tools/run_pep8 [testenv:cover] setenv = NOSE_WITH_COVERAGE=1 [testenv:pyflakes] deps = {[testenv]deps} -commands = pyflakes bin bin/savanna-api bin/savanna-manage savanna setup.py +commands = bash tools/run_pyflakes [testenv:venv] commands = {posargs}