openstack/neutron
Code Issues Proposed changes

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

Browse Source 
This reverts commit be63289c27.

Yes, it's a third order revert. Ain't it cool?

Now that tox 2.3.1 is used in gate, and it is expected to fix the issue
that we originally hacked around here, let's revert to the previous
code.

For the least, it makes API target executable locally without the need
to set TEMPEST_CONFIG_DIR in the external environment.

Also bump minimal tox version to 2.3 to avoid users hitting the old
issue with their tox 2.2.* package.

Change-Id: Ic64cb466d117ad39436cb1d079c8f5657260da2c
Related-Bug: #1515335
This commit is contained in:
Ihar Hrachyshka 2016-01-05 19:36:42 +01:00
parent 0c07378509
commit 380e384f18
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}