Commit 6344795bd87fc67687b188d7c9c9a542d3f9fd44 - python-castellan

Merge "Correct config path in functional test" Jenkins authored 6 years ago Gerrit Code Review committed 6 years ago

2 changed file(s) with 4 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all

-1

castellan/tests/functional/config.py less more

48	48	TEST_CONF.register_opts(identity_options, group=identity_group)
49	49
50	50	config_to_load = []
51		local_config = './../../../etc/castellan/castellan-functional.conf'
	51	local_config = './etc/castellan/castellan-functional.conf'
52	52	main_config = '/etc/castellan/castellan-functional.conf'
53	53	if os.path.isfile(config_file):
54	54	config_to_load.append(config_file)

-3

doc/source/testing.rst less more

46	46	.. _`Setting up a Barbican development environment`: http://docs.openstack.org/developer/barbican/setup/dev.html
47	47	.. _`Using Keystone Middleware with Barbican`: http://docs.openstack.org/developer/barbican/setup/keystone.html
48	48
49		Castellan uses ``/etc/castellan/castellan-functional.conf`` in order to
50		run functional tests. A sample file can be generated by running:
	49	Castellan uses either ``/etc/castellan/castellan-functional.conf`` or ``./etc/castellan/castellan-functional.conf``
	50	in order to run functional tests. A sample file can be generated by running:
51	51
52	52	.. code-block:: bash
53	53

56	56
57	57	``castellan/etc/castellan/castellan-functional.conf.sample`` is generated.
58	58	It must be renamed to ``castellan-functional.conf`` and placed in
59		``/etc/castellan``.
	59	``/etc/castellan`` or ``./etc/castellan``.
60	60
61	61	The file should look something like the following:
62	62