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, Use full path to salt.utils.which

Browse Source
This commit is contained in:
twangboy 2017-09-07 14:41:56 -06:00
parent f959113694
commit 4a8d7e522c
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/mount.py
View File

@ -11,7 +11,6 @@ import logging
# Import salt libs
import salt.utils
from salt.utils import which as _which
from salt.exceptions import CommandNotFoundError, CommandExecutionError
# Import 3rd-party libs
@ -1114,12 +1113,12 @@ def is_fuse_exec(cmd):
salt '*' mount.is_fuse_exec sshfs
'''
cmd_path = _which(cmd)
cmd_path = salt.utils.which(cmd)
# No point in running ldd on a command that doesn't exist
if not cmd_path:
return False
elif not _which('ldd'):
elif not salt.utils.which('ldd'):
raise CommandNotFoundError('ldd')
out = __salt__['cmd.run']('ldd {0}'.format(cmd_path), python_shell=False)

23
tests/unit/modules/test_mount.py
View File

@ -19,7 +19,7 @@ from tests.support.mock import (
# Import Salt Libs
import salt.utils
from salt.exceptions import CommandExecutionError
from salt.exceptions import CommandExecutionError, CommandNotFoundError
import salt.modules.mount as mount
MOCK_SHELL_FILE = 'A B C D F G\n'
@ -242,15 +242,26 @@ class MountTestCase(TestCase, LoaderModuleMockMixin):
'''
Returns true if the command passed is a fuse mountable application
'''
with patch.object(salt.utils, 'which', return_value=None):
# Return False if fuse doesn't exist
with patch('salt.utils.which', return_value=None):
self.assertFalse(mount.is_fuse_exec('cmd'))
with patch.object(salt.utils, 'which', return_value=True):
# Return CommandNotFoundError if fuse exists, but ldd doesn't exist
with patch('salt.utils.which', side_effect=[True, False]):
self.assertRaises(CommandNotFoundError, mount.is_fuse_exec, 'cmd')
# Return False if fuse exists, ldd exists, but libfuse is not in the
# return
with patch('salt.utils.which', side_effect=[True, True]):
mock = MagicMock(return_value='not correct')
with patch.dict(mount.__salt__, {'cmd.run': mock}):
self.assertFalse(mount.is_fuse_exec('cmd'))
mock = MagicMock(side_effect=[1, 0])
with patch.object(salt.utils, 'which', mock):
self.assertFalse(mount.is_fuse_exec('cmd'))
# Return True if fuse exists, ldd exists, and libfuse is in the return
with patch('salt.utils.which', side_effect=[True, True]):
mock = MagicMock(return_value='contains libfuse')
with patch.dict(mount.__salt__, {'cmd.run': mock}):
self.assertTrue(mount.is_fuse_exec('cmd'))
def test_swaps(self):
'''