Merge "Use functional_test.conf for devstack gate"
This commit is contained in:
commit
456ec16fd2
|
@ -5,7 +5,7 @@
|
||||||
#Replace values that represent barbican server and user information
|
#Replace values that represent barbican server and user information
|
||||||
url=http://localhost:9311
|
url=http://localhost:9311
|
||||||
username=barbican
|
username=barbican
|
||||||
password=orange
|
password=secretservice
|
||||||
project_name=service
|
project_name=service
|
||||||
project_id=service
|
project_id=service
|
||||||
#max_payload_size=10000
|
#max_payload_size=10000
|
||||||
|
|
|
@ -17,9 +17,19 @@ import os
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
|
||||||
|
|
||||||
CONF = config.CONF
|
CONF = config.CONF
|
||||||
|
|
||||||
|
|
||||||
|
def _get_conf_file_path():
|
||||||
|
functional_dir = os.path.split(os.path.abspath(__file__))[0]
|
||||||
|
base_dir = os.path.split(functional_dir)[0]
|
||||||
|
return os.path.join(base_dir, 'etc', 'functional_tests.conf')
|
||||||
|
|
||||||
|
|
||||||
# Use local tempest conf if one is available.
|
# Use local tempest conf if one is available.
|
||||||
# This usually means we're running tests outside of devstack
|
conf_file = _get_conf_file_path()
|
||||||
if os.path.exists('./etc/functional_tests.conf'):
|
if os.path.exists(conf_file):
|
||||||
CONF.set_config_path('./etc/functional_tests.conf')
|
CONF.set_config_path(conf_file)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -21,4 +21,6 @@ pip install -e $TEMPEST_DIR
|
||||||
# Install test-requirements
|
# Install test-requirements
|
||||||
pip install -r /opt/stack/new/python-barbicanclient/test-requirements.txt
|
pip install -r /opt/stack/new/python-barbicanclient/test-requirements.txt
|
||||||
|
|
||||||
|
echo "Running functional tests on $(python -V)"
|
||||||
|
|
||||||
nosetests -v .
|
nosetests -v .
|
||||||
|
|
Loading…
Reference in New Issue