IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Env._finalize_core() now also loads config from Env.conf_default

Browse Source
This commit is contained in:
Jason Gerard DeRose
2008-10-27 01:09:53 -06:00
parent 28dd8e74bd
commit 25a7df9615
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipalib/config.py
View File

@@ -203,6 +203,8 @@ class Env(object):
self.__doing('_finalize_core') self.__doing('_finalize_core')
self.__do_if_not_done('_bootstrap') self.__do_if_not_done('_bootstrap')
self._merge_config(self.conf) self._merge_config(self.conf)
if self.conf_default != self.conf:
self._merge_config(self.conf_default)
if 'in_server' not in self: if 'in_server' not in self:
self.in_server = (self.context == 'server') self.in_server = (self.context == 'server')
if 'log' not in self: if 'log' not in self:

10
tests/test_ipalib/test_config.py
View File

@@ -175,6 +175,14 @@ no = fALse
number = 42 number = 42
""" """
# A default config file to make sure it does not overwrite the explicit one
config_default = """
[global]
yes = Hello
not_in_other = foo_bar
"""
class test_Env(ClassChecker): class test_Env(ClassChecker):
""" """
@@ -328,6 +336,7 @@ class test_Env(ClassChecker):
for key in ('yes', 'no', 'number'): for key in ('yes', 'no', 'number'):
assert key not in o assert key not in o
home.write(config_good, '.ipa', 'server.conf') home.write(config_good, '.ipa', 'server.conf')
home.write(config_default, '.ipa', 'default.conf')
o._finalize_core() o._finalize_core()
assert o.in_tree is True assert o.in_tree is True
assert o.context == 'server' assert o.context == 'server'
@@ -336,6 +345,7 @@ class test_Env(ClassChecker):
assert o.yes is True assert o.yes is True
assert o.no is False assert o.no is False
assert o.number == 42 assert o.number == 42
assert o.not_in_other == 'foo_bar'
# Test using DEFAULT_CONFIG: # Test using DEFAULT_CONFIG:
defaults = dict(constants.DEFAULT_CONFIG) defaults = dict(constants.DEFAULT_CONFIG)