valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix test_disabled

Browse Source 
Use get instead of pop
This commit is contained in:
twangboy 2016-03-23 11:19:02 -06:00
parent fef8f90919
commit 9308ad1e7a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/mac_service.py
View File

@ -183,7 +183,7 @@ def launchctl(sub_cmd, *args, **kwargs):
salt '*' service.launchctl debug org.cups.cupsd salt '*' service.launchctl debug org.cups.cupsd
''' '''
# Get return type # Get return type
return_stdout = kwargs.pop('return_stdout', False) return_stdout = kwargs.get('return_stdout', False)
# Construct command # Construct command
cmd = ['launchctl', sub_cmd] cmd = ['launchctl', sub_cmd]

2
tests/integration/modules/mac_service.py
View File

@ -181,7 +181,7 @@ class MacServiceModuleTest(integration.ModuleCase):
self.assertTrue(self.run_function('service.stop', [SERVICE_NAME])) self.assertTrue(self.run_function('service.stop', [SERVICE_NAME]))
self.assertTrue(self.run_function('service.disabled', [SERVICE_NAME])) self.assertTrue(self.run_function('service.disabled', [SERVICE_NAME]))
self.assertTrue(self.run_function('service.enabled', ['spongebob'])) self.assertTrue(self.run_function('service.disabled', ['spongebob']))
def test_get_all(self): def test_get_all(self):
''' '''