Introduce test-requirements and update to stable/juno

Change-Id: I40907db9fba6008a99d95edb9fd8896fcab43b10
This commit is contained in:
Dmitry Tantsur 2015-01-16 14:08:32 +01:00
parent e29f66adf6
commit 440351f64e
3 changed files with 13 additions and 8 deletions

View File

@ -1,7 +1,7 @@
eventlet>=0.15.1 eventlet>=0.15.1,<0.16.0
Flask>=0.10,<1.0 Flask>=0.10,<1.0
python-ironicclient>=0.2.1 python-ironicclient>=0.2.1
python-keystoneclient>=0.10.0 python-keystoneclient>=0.10.0
requests>=2.2.0,!=2.4.0 requests>=1.2.1,!=2.4.0
six>=1.7.0 six>=1.7.0
stevedore>=1.1.0 stevedore>=1.0.0

7
test-requirements.txt Normal file
View File

@ -0,0 +1,7 @@
# generic
coverage
docutils
hacking
mock
# plugin-specific

View File

@ -5,8 +5,7 @@ envlist = py27,py33,pep8,func
usedevelop = True usedevelop = True
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
mock -r{toxinidir}/test-requirements.txt
coverage
commands = commands =
coverage run --branch --include "ironic_discoverd*" -m unittest discover ironic_discoverd.test coverage run --branch --include "ironic_discoverd*" -m unittest discover ironic_discoverd.test
coverage report -m --fail-under 90 coverage report -m --fail-under 90
@ -16,8 +15,7 @@ setenv = PYTHONDONTWRITEBYTECODE=1
basepython = python2.7 basepython = python2.7
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
hacking -r{toxinidir}/test-requirements.txt
docutils
commands = commands =
flake8 ironic_discoverd flake8 ironic_discoverd
rst2html.py --strict README.rst /dev/null rst2html.py --strict README.rst /dev/null
@ -33,6 +31,6 @@ import_exceptions = ironicclient.exceptions
basepython = python2.7 basepython = python2.7
deps = deps =
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
mock -r{toxinidir}/test-requirements.txt
commands = commands =
python functest/run.py python functest/run.py