openstack/neutron
Code Issues Proposed changes

Merge "Revert "Revert "Revert "Remove TEMPEST_CONFIG_DIR in the api tox env""""

Browse Source
This commit is contained in:
Jenkins 2016-01-06 20:48:13 +00:00 committed by Gerrit Code Review
commit ecc108caa8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tox.ini
View File

@ -1,6 +1,6 @@
[tox] [tox]
envlist = docs,py34,py27,pep8 envlist = docs,py34,py27,pep8
minversion = 2.0 minversion = 2.3
skipsdist = True skipsdist = True
[testenv] [testenv]
@ -24,9 +24,8 @@ basepython = python2.7
passenv = {[testenv]passenv} TEMPEST_CONFIG_DIR passenv = {[testenv]passenv} TEMPEST_CONFIG_DIR
setenv = {[testenv]setenv} setenv = {[testenv]setenv}
OS_TEST_PATH=./neutron/tests/api OS_TEST_PATH=./neutron/tests/api
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
OS_TEST_API_WITH_REST=1 OS_TEST_API_WITH_REST=1
# If you are running the tests locally you should set the env variable
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
[testenv:api-constraints] [testenv:api-constraints]
basepython = {[testenv:api]basepython} basepython = {[testenv:api]basepython}