saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #27468 from cachedout/fix_27351

Browse source 
Fix 27351
This commit is contained in:
Mike Place 2015-09-29 09:35:29 -06:00
commit ee6e0ed057
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/darwin_sysctl.py
View file

@ -176,9 +176,11 @@ def persist(name, value, config='/etc/sysctl.conf', apply_change=False):
return 'Already set'
new_line = '{0}={1}'.format(name, value)
nlines.append(new_line)
nlines.append('\n')
edited = True
if not edited:
nlines.append('{0}={1}'.format(name, value))
nlines.append('\n')
with salt.utils.fopen(config, 'w+') as ofile:
ofile.writelines(nlines)
# If apply_change=True, apply edits to system

2
tests/unit/modules/darwin_sysctl_test.py
View file

@ -92,7 +92,7 @@ class DarwinSysctlTestCase(TestCase):
Tests successful write to existing sysctl file
'''
to_write = '#\n# Kernel sysctl configuration\n#\n'
m_calls_list = [call.writelines(['net.inet.icmp.icmplim=50'])]
m_calls_list = [call.writelines(['net.inet.icmp.icmplim=50', '\n'])]
with patch('salt.utils.fopen', mock_open(read_data=to_write)) as m_open:
darwin_sysctl.persist('net.inet.icmp.icmplim', 50, config=to_write)
helper_open = m_open()