Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lust/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def load_ini_file(file_name, defaults={}):
for key, value in config.items(section):
results[section + '.' + key] = value

results.update(defaults)
defaults.update(results)

return results
return defaults

8 changes: 5 additions & 3 deletions tests/config_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ def test_load_ini_file():

def test_load_ini_file_defaults():
settings = config.load_ini_file("tests/sample.ini", defaults={'threadserver.run_dir':
'/var/other'})
assert_equal(settings['threadserver.run_dir'], '/var/other')

'/var/other',
'threadserver.port':
4227})
assert_equal(settings['threadserver.run_dir'], '/var/run/threadserver') # defaults is overwritten
assert_equal(settings['threadserver.port'], 4227) # defaults