Merge "Fix tox does not pass arguments to nose"
This commit is contained in:
commit
8a376c9e07
12
tox.ini
12
tox.ini
@ -14,7 +14,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands = /bin/bash run_tests.sh -N --no-pep8
|
||||
commands = /bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||
|
||||
[testenv:pep8]
|
||||
commands = /bin/bash run_tests.sh -N --pep8
|
||||
@ -24,25 +24,25 @@ commands = /bin/bash run_tests.sh -N --pep8
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
commands = /bin/bash run_tests.sh -N --no-pep8 --coverage
|
||||
commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
|
||||
|
||||
[testenv:py27dj14]
|
||||
basepython = python2.7
|
||||
commands = pip install django==1.4
|
||||
/bin/bash run_tests.sh -N --no-pep8
|
||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||
|
||||
[testenv:py27dj15]
|
||||
basepython = python2.7
|
||||
commands = pip install django>=1.5,<1.6
|
||||
/bin/bash run_tests.sh -N --no-pep8
|
||||
/bin/bash run_tests.sh -N --no-pep8 {posargs}
|
||||
|
||||
[testenv:py27integration]
|
||||
basepython = python2.7
|
||||
commands = /bin/bash run_tests.sh -N --integration
|
||||
commands = /bin/bash run_tests.sh -N --integration {posargs}
|
||||
|
||||
[testenv:py26integration]
|
||||
basepython = python2.6
|
||||
commands = /bin/bash run_tests.sh -N --integration
|
||||
commands = /bin/bash run_tests.sh -N --integration {posargs}
|
||||
|
||||
[tox:jenkins]
|
||||
downloadcache = ~/cache/pip
|
||||
|
Loading…
x
Reference in New Issue
Block a user