diff options
| -rw-r--r-- | setup.cfg | 7 | ||||
| -rw-r--r-- | tools/test-requires | 11 | ||||
| -rw-r--r-- | tox.ini | 26 |
3 files changed, 15 insertions, 29 deletions
@@ -15,7 +15,6 @@ source-dir = doc/source # openstack-nose https://github.com/jkoelker/openstack-nose verbosity=2 detailed-errors=1 -with-openstack=1 -openstack-red=0.05 -openstack-yellow=0.025 -openstack-show-elapsed=1 +cover-package = keystone +cover-html = true +cover-erase = true diff --git a/tools/test-requires b/tools/test-requires index e4f90bdf..c35d0150 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -11,20 +11,17 @@ nose # for test discovery and console feedback nosexcover openstack.nose_plugin pylint # static code analysis -pep8==0.6.1 # checks for PEP8 code style compliance +pep8==1.1 # checks for PEP8 code style compliance Sphinx>=1.1.2 # required to build documentation unittest2 # backport of unittest lib in python 2.7 webtest # test wsgi apps without starting an http server distribute>=0.6.24 +iso8601>=0.1.4 # for python-keystoneclient httplib2 --e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient - -# for python-novaclient -prettytable==0.5.0 -iso8601>=0.1.4 +https://github.com/openstack/python-keystoneclient/zipball/master#egg=python-keystoneclient # swift_auth test dependencies --e git+https://github.com/openstack/swift.git#egg=swift +https://github.com/openstack/swift/zipball/master#egg=swift netifaces @@ -3,15 +3,21 @@ envlist = py26,py27,pep8 [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 = bash run_tests.sh -N --no-pep8 [testenv:pep8] -deps = pep8 +deps = pep8==1.1 commands = pep8 --exclude=vcsversion.py,*.pyc --repeat --show-source bin keystone setup.py -[testenv:hudson] +[tox:jenkins] downloadcache = ~/cache/pip [testenv:cover] @@ -19,19 +25,3 @@ commands = /bin/bash run_tests.sh -N -P --with-xcoverage --cover-erase --cover-p [testenv:venv] commands = {posargs} - -[testenv:jenkins26] -basepython = python2.6 -deps = file://{toxinidir}/.cache.bundle - -[testenv:jenkins27] -basepython = python2.7 -deps = file://{toxinidir}/.cache.bundle - -[testenv:jenkinscover] -deps = file://{toxinidir}/.cache.bundle -commands = /bin/bash run_tests.sh -N -P --with-xcover --cover-erase --cover-package=keystone - -[testenv:jenkinsvenv] -deps = file://{toxinidir}/.cache.bundle -commands = {posargs} |