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 #38809 from twangboy/fix_hostname_2016.3

Browse source 
Fix get_hostname to handle longer computer names
This commit is contained in:
Mike Place 2017-01-18 12:31:59 -07:00 • committed by GitHub
commit 23b8b47258
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/win_system.py
View file

@ -448,10 +448,9 @@ def get_hostname():
salt 'minion-id' system.get_hostname
'''
cmd = 'wmic computersystem get name'
cmd = 'hostname'
ret = __salt__['cmd.run'](cmd=cmd)
_, hostname = ret.split("\n")
return hostname
return ret
def set_hostname(hostname):

4
tests/unit/modules/win_system_test.py
View file

@ -291,11 +291,11 @@ class WinSystemTestCase(TestCase):
'''
Test setting a new hostname
'''
cmd_run_mock = MagicMock(return_value="Name\nMINION")
cmd_run_mock = MagicMock(return_value="MINION")
with patch.dict(win_system.__salt__, {'cmd.run': cmd_run_mock}):
ret = win_system.get_hostname()
self.assertEqual(ret, "MINION")
cmd_run_mock.assert_called_once_with(cmd="wmic computersystem get name")
cmd_run_mock.assert_called_once_with(cmd="hostname")
if __name__ == '__main__':