openstack
/
neutron-lbaas
Code Issues Proposed changes

Revert "Remove TEMPEST_CONFIG_DIR in the api tox env" 

This reverts commit ad815651de.

Change-Id: Ieb26c5b18ed2e5a3e61a54fbb511e4dd8a4e5a4b
This commit is contained in:
Armando Migliaccio 2015-11-12 00:21:11 +00:00
parent ad815651de
commit 286f5d41dc
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tox.ini
View File

@ -65,46 +65,30 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,to
import_exceptions = neutron.i18n
local-check-factory = neutron.hacking.checks.factory
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:apiv1]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v1/api
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:apiv2]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/api
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:scenario]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}
# TODO(armax): due to bug #1515335, set TEMPEST_CONFIG_DIR in your
# local env, like this:
#
# TEMPEST_CONFIG_DIR=/opt/stack/tempest/etc
#
[testenv:ddt]
sitepackages = True
setenv =
OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/ddt
OS_TESTR_CONCURRENCY=1
TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc}