openstack
/
castellan
Code Issues Proposed changes

Merge "Correct config path in functional test"

This commit is contained in:
Jenkins 2017-06-14 20:45:48 +00:00 committed by Gerrit Code Review
parent 5d2280ae3d 310fc84652
commit 6344795bd8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
castellan/tests/functional/config.py
View File

@ -49,7 +49,7 @@ def setup_config(config_file=''):
TEST_CONF.register_opts(identity_options, group=identity_group)
config_to_load = []
local_config = './../../../etc/castellan/castellan-functional.conf'
local_config = './etc/castellan/castellan-functional.conf'
main_config = '/etc/castellan/castellan-functional.conf'
if os.path.isfile(config_file):
config_to_load.append(config_file)

6
doc/source/testing.rst
View File

@ -47,8 +47,8 @@ and `Using Keystone Middleware with Barbican`_
.. _`Setting up a Barbican development environment`: http://docs.openstack.org/developer/barbican/setup/dev.html
.. _`Using Keystone Middleware with Barbican`: http://docs.openstack.org/developer/barbican/setup/keystone.html
Castellan uses ``/etc/castellan/castellan-functional.conf`` in order to
run functional tests. A sample file can be generated by running:
Castellan uses either ``/etc/castellan/castellan-functional.conf`` or ``./etc/castellan/castellan-functional.conf``
in order to run functional tests. A sample file can be generated by running:
.. code-block:: bash
@ -57,7 +57,7 @@ run functional tests. A sample file can be generated by running:
``castellan/etc/castellan/castellan-functional.conf.sample`` is generated.
It must be renamed to ``castellan-functional.conf`` and placed in
``/etc/castellan``.
``/etc/castellan`` or ``./etc/castellan``.
The file should look something like the following: