openstack
/
neutron-fwaas
Code Issues Proposed changes

Migrate to oslo.concurrency 

Namespaces are not used anymore, so imports are for oslo_concurrency,
not oslo.concurrency.

lockutils direct call is not supported anymore, so using shipped
lockutils-wrapper instead.

Closes-Bug: #1387092
Change-Id: I2ba2295f8f5d55f272a9d23555940586b25b5a1c
This commit is contained in:
Ihar Hrachyshka 2015-01-14 17:49:06 +01:00
parent 4b76915db6
commit 8b83163d6a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test-requirements.txt
View File

@ -12,6 +12,7 @@ python-subunit>=0.0.18
requests-mock>=0.5.1 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.2.0 # Apache-2.0
oslo.concurrency>=0.3.0,!=0.4.0
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0
testscenarios>=0.4

2
tools/pretty_tox.sh
View File

@ -3,4 +3,4 @@
TESTRARGS=$1
exec 3>&1
status=$(exec 4>&1 >&3; ( python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | $(dirname $0)/subunit-trace.py -f) && exit $status
status=$(exec 4>&1 >&3; ( lockutils-wrapper python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | $(dirname $0)/subunit-trace.py -f) && exit $status

6
tox.ini
View File

@ -28,7 +28,7 @@ setenv = VIRTUAL_ENV={envdir}
[testenv:functional]
setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
commands =
python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
[testenv:dsvm-functional]
setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
@ -37,7 +37,7 @@ setenv = OS_TEST_PATH=./neutron_fwaas/tests/functional
OS_FAIL_ON_MISSING_DEPS=1
sitepackages=True
commands =
python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}'
lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
[tox:jenkins]
sitepackages = True
@ -56,7 +56,7 @@ commands = python ./tools/check_i18n.py ./neutron_fwaas ./tools/i18n_cfg.py
[testenv:cover]
commands =
python -m neutron_fwaas.openstack.common.lockutils python setup.py testr --coverage --testr-args='{posargs}'
lockutils-wrapper python setup.py testr --coverage --testr-args='{posargs}'
[testenv:venv]
commands = {posargs}