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 #48664 from Ch3LL/srv_disable_mac

Browse source 
[2017.7] Fix service.disabled test for macosx
This commit is contained in:
Nicole Thomas 2018-07-20 10:32:55 -04:00 • committed by GitHub
commit 1ebd96d909
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/modules/test_service.py
View file

@ -118,21 +118,21 @@ class ServiceModuleTest(ModuleCase):
systemd = salt.utils.systemd.booted()
# check service was not enabled
if systemd or salt.utils.is_windows():
self.assertIn('ERROR', enable)
else:
try:
self.assertFalse(enable)
except AssertionError:
self.assertIn('ERROR', enable)
# check service was not disabled
if tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info']) == (14, 0o4) and not systemd:
# currently upstart does not have a mechanism to report if disabling a service fails if does not exist
self.assertTrue(self.run_function('service.disable', [srv_name]))
else:
if salt.utils.is_windows():
try:
disable = self.run_function('service.disable', [srv_name])
self.assertFalse(disable)
except AssertionError:
self.assertTrue('error' in disable.lower())
else:
self.assertFalse(self.run_function('service.disable', [srv_name]))
if salt.utils.is_darwin():
self.assertFalse(self.run_function('service.disabled', [srv_name]))