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

[2017.7] Fix service.disabled test for macosx

Browse source
This commit is contained in:
Ch3LL 2018-07-18 17:58:44 -04:00
parent 0d4c80205f
commit fb953c2369
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,9 +118,9 @@ class ServiceModuleTest(ModuleCase):
systemd = salt.utils.systemd.booted()
# check service was not enabled
if systemd or salt.utils.is_windows():
try:
self.assertIn('ERROR', enable)
else:
except AssertionError:
self.assertFalse(enable)
# check service was not disabled
@ -128,11 +128,11 @@ class ServiceModuleTest(ModuleCase):
# 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.assertTrue('error' in disable.lower())
else:
self.assertFalse(self.run_function('service.disable', [srv_name]))
except AssertionError:
self.assertFalse(disable)
if salt.utils.is_darwin():
self.assertFalse(self.run_function('service.disabled', [srv_name]))