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 #48304 from Ch3LL/swap_mac

Browse source 
Fix macosx grains when swapusage returns comma
This commit is contained in:
Nicole Thomas 2018-07-20 10:30:58 -04:00 • committed by GitHub
commit dfc1582475
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/grains/core.py
View file

@ -448,7 +448,7 @@ def _osx_memdata():
sysctl = salt.utils.path.which('sysctl')
if sysctl:
mem = __salt__['cmd.run']('{0} -n hw.memsize'.format(sysctl))
swap_total = __salt__['cmd.run']('{0} -n vm.swapusage'.format(sysctl)).split()[2]
swap_total = __salt__['cmd.run']('{0} -n vm.swapusage'.format(sysctl)).split()[2].replace(',', '.')
if swap_total.endswith('K'):
_power = 2**10
elif swap_total.endswith('M'):

30
tests/unit/grains/test_core.py
View file

@ -908,3 +908,33 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin):
osdata = {'kernel': 'Linux', }
ret = core._virtual(osdata)
self.assertEqual(ret['virtual'], virt)
@patch('salt.utils.path.which', MagicMock(return_value='/usr/sbin/sysctl'))
def test_osx_memdata_with_comma(self):
'''
test osx memdata method when comma returns
'''
def _cmd_side_effect(cmd):
if 'hw.memsize' in cmd:
return '4294967296'
elif 'vm.swapusage' in cmd:
return 'total = 1024,00M used = 160,75M free = 863,25M (encrypted)'
with patch.dict(core.__salt__, {'cmd.run': MagicMock(side_effect=_cmd_side_effect)}):
ret = core._osx_memdata()
assert ret['swap_total'] == 1024
assert ret['mem_total'] == 4096
@patch('salt.utils.path.which', MagicMock(return_value='/usr/sbin/sysctl'))
def test_osx_memdata(self):
'''
test osx memdata
'''
def _cmd_side_effect(cmd):
if 'hw.memsize' in cmd:
return '4294967296'
elif 'vm.swapusage' in cmd:
return 'total = 0.00M used = 0.00M free = 0.00M (encrypted)'
with patch.dict(core.__salt__, {'cmd.run': MagicMock(side_effect=_cmd_side_effect)}):
ret = core._osx_memdata()
assert ret['swap_total'] == 0
assert ret['mem_total'] == 4096