openstack
/
deb-python-oslo.privsep
Code Issues Proposed changes

Merge "Deal with CONF.config_dir correctly"

This commit is contained in:
Jenkins 2016-09-09 07:06:20 +00:00 committed by Gerrit Code Review
parent 44aa3bca36 1666d9153a
commit 85eb50e275
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_privsep/priv_context.py
View File

@ -158,7 +158,8 @@ class PrivContext(object):
try:
if cfg.CONF.config_dir is not None:
cmd.extend(['--config-dir', cfg.CONF.config_dir])
for cfg_dir in cfg.CONF.config_dir:
cmd.extend(['--config-dir', cfg_dir])
except cfg.NoSuchOptError:
pass

2
oslo_privsep/tests/test_priv_context.py
View File

@ -104,7 +104,7 @@ class PrivContextTest(testctx.TestContextTestCase):
def test_helper_command_default_dirtoo(self):
self.privsep_conf.config_file = ['/bar.conf', '/baz.conf']
self.privsep_conf.config_dir = '/foo.d'
self.privsep_conf.config_dir = ['/foo.d']
cmd = testctx.context.helper_command('/tmp/sockpath')
expected = [
'sudo', 'privsep-helper',