diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-05-16 10:40:33 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2012-05-16 13:55:04 -0400 |
| commit | cb8eea487532720922a76ec246327ead4cb627ce (patch) | |
| tree | 7026e7c6c0ac68bbb62d31c26be143da1a020dc3 | |
| parent | 66522fdc9c09a65b87fe412e7bea87e4761ec43d (diff) | |
| download | python-novaclient-cb8eea487532720922a76ec246327ead4cb627ce.tar.gz | |
Align tox.ini with standards.folsom-1
Change-Id: Iab112bae0187d025b9b0b6c88208d6706093a184
| -rw-r--r-- | tools/pip-requires | 5 | ||||
| -rw-r--r-- | tools/test-requires | 10 | ||||
| -rw-r--r-- | tox.ini | 44 |
3 files changed, 48 insertions, 11 deletions
diff --git a/tools/pip-requires b/tools/pip-requires index 510f2c19..32cdbc0b 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,9 +1,4 @@ argparse -coverage httplib2 -mock -nose prettytable simplejson -pep8==0.6.1 -unittest2 diff --git a/tools/test-requires b/tools/test-requires new file mode 100644 index 00000000..01990df5 --- /dev/null +++ b/tools/test-requires @@ -0,0 +1,10 @@ +distribute>=0.6.24 + +mock +nose +nose-exclude +nosexcover +openstack.nose_plugin +pep8>=1.0 +sphinx>=1.1.2 +unittest2 @@ -1,14 +1,46 @@ [tox] -envlist = py26,py27 +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 deps = -r{toxinidir}/tools/pip-requires -commands = /bin/bash run_tests.sh -N + -r{toxinidir}/tools/test-requires +commands = nosetests [testenv:pep8] deps = pep8 -commands = /bin/bash run_tests.sh -N --pep8 +commands = pep8 --repeat --show-source novaclient setup.py -[testenv:coverage] -deps = coverage -commands = /bin/bash run_tests.sh -N --coverage +[testenv:venv] +commands = {posargs} + +[testenv:cover] +commands = nosetests --cover-erase --cover-package=novaclient --with-xcoverage + +[tox:jenkins] +downloadcache = ~/cache/pip + +[testenv:jenkins26] +basepython = python2.6 +setenv = NOSE_WITH_XUNIT=1 +deps = file://{toxinidir}/.cache.bundle + +[testenv:jenkins27] +basepython = python2.7 +setenv = NOSE_WITH_XUNIT=1 +deps = file://{toxinidir}/.cache.bundle + +[testenv:jenkinscover] +deps = file://{toxinidir}/.cache.bundle +setenv = NOSE_WITH_XUNIT=1 +commands = nosetests --cover-erase --cover-package=novaclient --with-xcoverage + +[testenv:jenkinsvenv] +deps = file://{toxinidir}/.cache.bundle +setenv = NOSE_WITH_XUNIT=1 +commands = {posargs} |