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 #29218 from clan/service_state

Browse source 
check service enable state in test mode
This commit is contained in:
Mike Place 2015-12-02 08:31:00 -07:00
commit 99b7d87688
2 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/states/service.py
View file

@ -298,17 +298,11 @@ def running(name, enable=None, sig=None, init_delay=None, **kwargs):
# See if the service is already running
if before_toggle_status:
ret['comment'] = 'The service {0} is already running'.format(name)
if __opts__['test']:
ret['result'] = True
return ret
if enable is True and not before_toggle_enable_status:
ret.update(_enable(name, None, **kwargs))
return ret
elif enable is False and before_toggle_enable_status:
ret.update(_disable(name, None, **kwargs))
return ret
else:
return ret
return ret
# Run the tests
if __opts__['test']:
@ -385,14 +379,10 @@ def dead(name, enable=None, sig=None, **kwargs):
before_toggle_enable_status = __salt__['service.enabled'](name)
if not before_toggle_status:
ret['comment'] = 'The service {0} is already dead'.format(name)
if not __opts__['test']:
if enable is True and not before_toggle_enable_status:
ret.update(_enable(name, None, **kwargs))
elif enable is False and before_toggle_enable_status:
ret.update(_disable(name, None, **kwargs))
return ret
else:
ret['result'] = True
if enable is True and not before_toggle_enable_status:
ret.update(_enable(name, None, **kwargs))
elif enable is False and before_toggle_enable_status:
ret.update(_disable(name, None, **kwargs))
return ret
if __opts__['test']:

2
tests/unit/states/service_test.py
View file

@ -151,7 +151,7 @@ class ServiceTestCase(TestCase):
{'changes': {},
'comment': 'Service salt was killed', 'name': 'salt',
'result': True},
{'changes': {},
{'changes': 'saltstack',
'comment': 'The service salt is already dead', 'name': 'salt',
'result': True}]