Added testr
This commit is contained in:
parent
d6c5389bde
commit
df6d73d59c
@ -1,8 +1,8 @@
|
|||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
||||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
|
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
|
||||||
${PYTHON:-python} -m subunit.run discover -t . ./tests $LISTOPT $IDOPTION
|
${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
|
||||||
|
|
||||||
test_id_option=--load-list $IDFILE
|
test_id_option=--load-list $IDFILE
|
||||||
test_list_option=--list
|
test_list_option=--list
|
||||||
|
48
tox.ini
48
tox.ini
@ -1,49 +1,39 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 1.6
|
minversion = 1.6
|
||||||
envlist = py26,py27,py33,pypy,pep8,lint2,lint3
|
envlist = py26,py27,py33,pep8
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
|
||||||
# Customize pip command, add -U to force updates.
|
|
||||||
install_command = pip install -U {opts} {packages}
|
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
GLANCE_STORE_TESTS_DIR={toxinidir}/tests
|
usedevelop = True
|
||||||
GLANCE_STORE_TESTS_CONFIGS_DIR={toxinidir}/tests/etc/
|
install_command = pip install --allow-all-external --allow-insecure netaddr -U {opts} {packages}
|
||||||
|
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
#commands = nosetests {posargs}
|
commands = python setup.py test --slowest --testr-args='--concurrency 1 {posargs}'
|
||||||
commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posargs}'
|
|
||||||
|
|
||||||
[tox:jenkins]
|
[tox:jenkins]
|
||||||
downloadcache = ~/cache/pip
|
downloadcache = ~/cache/pip
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
commands = flake8
|
commands =
|
||||||
|
flake8 {posargs}
|
||||||
[testenv:lint2]
|
|
||||||
basepython = python2
|
|
||||||
deps = pylint
|
|
||||||
commands = pylint ./glance.store ./tests -E --ignore ./openstack
|
|
||||||
|
|
||||||
[testenv:lint3]
|
|
||||||
basepython = python3
|
|
||||||
deps = pylint
|
|
||||||
commands = pylint ./glance.store ./tests -E --ignore ./openstack
|
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
setenv = NOSE_WITH_COVERAGE=1
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
commands =
|
commands = python setup.py testr --coverage --testr-args='^(?!.*test.*coverage).*$'
|
||||||
python setup.py testr --coverage \
|
|
||||||
--testr-args='^(?!.*test.*coverage).*$'
|
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[flake8]
|
[flake8]
|
||||||
exclude = .venv*,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*.egg,.update-venv
|
# TODO(dmllr): Analyze or fix the warnings blacklisted below
|
||||||
|
# E711 comparison to None should be 'if cond is not None:'
|
||||||
[hacking]
|
# E712 comparison to True should be 'if cond is True:' or 'if cond:'
|
||||||
import_exceptions = glance.store.openstack.common.gettextutils._
|
# F821 undefined name 'name'
|
||||||
|
# F841 local variable 'name' assigned but never used
|
||||||
|
# H301 one import per line
|
||||||
|
# H402 one line docstring needs punctuation.
|
||||||
|
# H404 multi line docstring should start with a summary
|
||||||
|
ignore = E711,E712,F821,F841,H301,H402,H404
|
||||||
|
builtins = _
|
||||||
|
exclude = .venv,.git,.tox,dist,doc,etc,*glance/store/locale*,*openstack/common*,*lib/python*,*egg,build
|
||||||
|
Loading…
Reference in New Issue
Block a user