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

make system.reboot use shutdown -r when available

Browse source 
see issue #27710
This commit is contained in:
Andreas Lutro 2015-10-09 08:38:36 +02:00
parent ec35666ff2
commit 04ef51e524
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
salt/modules/system.py
View file

@ -61,9 +61,12 @@ def poweroff():
return ret
def reboot():
def reboot(at_time=None):
'''
Reboot the system using the 'reboot' command
Reboot the system
at_time
The wait time in minutes before the system will be shutdown.
CLI Example:
@ -71,7 +74,7 @@ def reboot():
salt '*' system.reboot
'''
cmd = ['reboot']
cmd = ['shutdown', '-r', ('{0}'.format(at_time) if at_time else 'now')]
ret = __salt__['cmd.run'](cmd, python_shell=False)
return ret
@ -89,10 +92,6 @@ def shutdown(at_time=None):
salt '*' system.shutdown 5
'''
if at_time:
cmd = ['shutdown', '-h', '{0}'.format(at_time)]
else:
cmd = ['shutdown', '-h', 'now']
cmd = ['shutdown', '-h', ('{0}'.format(at_time) if at_time else 'now')]
ret = __salt__['cmd.run'](cmd, python_shell=False)
return ret

18
tests/unit/modules/system_test.py
View file

@ -53,13 +53,23 @@ class SystemTestCase(TestCase):
{'cmd.run': MagicMock(return_value='A')}):
self.assertEqual(system.poweroff(), 'A')
@patch.dict(system.__salt__, {'cmd.run': MagicMock(return_value='A')})
def test_reboot(self):
'''
Test to reboot the system using the 'reboot' command
Test to reboot the system with shutdown -r
'''
with patch.dict(system.__salt__,
{'cmd.run': MagicMock(return_value='A')}):
self.assertEqual(system.reboot(), 'A')
self.assertEqual(system.reboot(), 'A')
system.__salt__['cmd.run'].assert_called_with(
['shutdown', '-r', 'now'], python_shell=False)
@patch.dict(system.__salt__, {'cmd.run': MagicMock(return_value='A')})
def test_reboot_with_delay(self):
'''
Test to reboot the system using shutdown -r with a delay
'''
self.assertEqual(system.reboot(at_time=5), 'A')
system.__salt__['cmd.run'].assert_called_with(
['shutdown', '-r', '5'], python_shell=False)
def test_shutdown(self):
'''