valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix tests for mac_utils

Browse Source
This commit is contained in:
twangboy 2016-03-04 16:36:02 -07:00
parent 7bed7c3fb8
commit 75546eadaf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/utils/mac_utils_test.py
View File

@ -18,8 +18,6 @@ ensure_in_syspath('../../')
from salt.utils import mac_utils
from salt.exceptions import SaltInvocationError, CommandExecutionError
mac_utils.__salt__ = {}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class MacUtilsTestCase(TestCase):
@ -33,7 +31,7 @@ class MacUtilsTestCase(TestCase):
'''
mock_cmd = MagicMock(return_value={'retcode': 0,
'stdout': 'not supported'})
with patch.dict(mac_utils.__salt__, {'cmd.run_all': mock_cmd}):
with patch.object(mac_utils, '_run_all', mock_cmd):
ret = mac_utils.execute_return_success('dir c:\\')
self.assertEqual(ret, 'Not supported on this machine')
@ -44,7 +42,7 @@ class MacUtilsTestCase(TestCase):
'''
mock_cmd = MagicMock(return_value={'retcode': 1,
'stdout': 'spongebob'})
with patch.dict(mac_utils.__salt__, {'cmd.run_all': mock_cmd}):
with patch.object(mac_utils, '_run_all', mock_cmd):
self.assertRaises(CommandExecutionError,
mac_utils.execute_return_success,
'dir c:\\')
@ -56,7 +54,7 @@ class MacUtilsTestCase(TestCase):
'''
mock_cmd = MagicMock(return_value={'retcode': 0,
'stdout': 'spongebob'})
with patch.dict(mac_utils.__salt__, {'cmd.run_all': mock_cmd}):
with patch.object(mac_utils, '_run_all', mock_cmd):
ret = mac_utils.execute_return_success('dir c:\\')
self.assertEqual(ret, True)
@ -68,7 +66,7 @@ class MacUtilsTestCase(TestCase):
mock_cmd = MagicMock(return_value={'retcode': 1,
'stdout': 'spongebob',
'stderr': 'squarepants'})
with patch.dict(mac_utils.__salt__, {'cmd.run_all': mock_cmd}):
with patch.object(mac_utils, '_run_all', mock_cmd):
self.assertRaises(CommandExecutionError,
mac_utils.execute_return_result,
'dir c:\\')
@ -80,7 +78,7 @@ class MacUtilsTestCase(TestCase):
'''
mock_cmd = MagicMock(return_value={'retcode': 0,
'stdout': 'spongebob'})
with patch.dict(mac_utils.__salt__, {'cmd.run_all': mock_cmd}):
with patch.object(mac_utils, '_run_all', mock_cmd):
ret = mac_utils.execute_return_result('dir c:\\')
self.assertEqual(ret, 'spongebob')