Update functionaltests to be able to run tox -e functional
Removed extra "nose" pre-req from tox.ini as it is already in test-requirements.txt, and it causes a "double requirement" error when running via tox. Also fixed relative directory reference to ensure we pick up the right etc/functional_tests.conf file. Change-Id: Iffb2891012ff0a4bb13a34bd7f8784104453b150
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
"""
|
||||
Copyright 2015 Rackspace
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
import os
|
||||
|
||||
from tempest import config
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
# Use local tempest conf if one is available.
|
||||
# This usually means we're running tests outside of devstack
|
||||
if os.path.exists('./etc/functional_tests.conf'):
|
||||
CONF.set_config_path('./etc/functional_tests.conf')
|
||||
@@ -22,8 +22,8 @@ CONF = config.CONF
|
||||
|
||||
# Use local tempest conf if one is available.
|
||||
# This usually means we're running tests outside of devstack
|
||||
if os.path.exists('../etc/functional_tests.conf'):
|
||||
CONF.set_config_path('../etc/functional_tests.conf')
|
||||
if os.path.exists('./etc/functional_tests.conf'):
|
||||
CONF.set_config_path('./etc/functional_tests.conf')
|
||||
|
||||
CONF.register_group(cfg.OptGroup('keymanager'))
|
||||
CONF.register_opt(cfg.StrOpt('url'), group='keymanager')
|
||||
|
||||
Reference in New Issue
Block a user