mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
3184168365
This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
95 lines
3.0 KiB
Python
95 lines
3.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Jayesh Kariya <jayeshk@saltstack.com>`
|
|
'''
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
import copy
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.unit import skipIf, TestCase
|
|
from tests.support.mock import (
|
|
NO_MOCK,
|
|
NO_MOCK_REASON,
|
|
MagicMock,
|
|
patch
|
|
)
|
|
|
|
# Import Salt Libs
|
|
import salt.modules.scsi as scsi
|
|
import salt.utils.path
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class ScsiTestCase(TestCase, LoaderModuleMockMixin):
|
|
'''
|
|
Test cases for salt.modules.scsi
|
|
'''
|
|
def setup_loader_modules(self):
|
|
return {scsi: {}}
|
|
|
|
def test_ls_(self):
|
|
'''
|
|
Test for list SCSI devices, with details
|
|
'''
|
|
lsscsi = {
|
|
'stdout': '[0:0:0:0] disk HP LOGICAL VOLUME 6.68 /dev/sda [8:0]',
|
|
'stderr': '',
|
|
'retcode': 0
|
|
}
|
|
|
|
lsscsi_size = {
|
|
'stdout': '[0:0:0:0] disk HP LOGICAL VOLUME 6.68 /dev/sda [8:0] 1.20TB',
|
|
'stderr': '',
|
|
'retcode': 0
|
|
}
|
|
|
|
result = {
|
|
'[0:0:0:0]': {
|
|
'major': '8',
|
|
'lun': '0:0:0:0',
|
|
'device': '/dev/sda',
|
|
'model': 'LOGICAL VOLUME 6.68',
|
|
'minor': '0',
|
|
'size': None,
|
|
}
|
|
}
|
|
result_size = copy.deepcopy(result)
|
|
result_size['[0:0:0:0]']['size'] = '1.20TB'
|
|
|
|
mock = MagicMock(return_value='/usr/bin/lsscsi')
|
|
with patch.object(salt.utils.path, 'which', mock):
|
|
# get_size = True
|
|
|
|
cmd_mock = MagicMock(return_value=lsscsi_size)
|
|
with patch.dict(scsi.__salt__, {'cmd.run_all': cmd_mock}):
|
|
self.assertDictEqual(scsi.ls_(), result_size)
|
|
with patch.dict(lsscsi_size, {'retcode': 1, 'stderr': 'An error occurred'}):
|
|
self.assertEqual(scsi.ls_(), 'An error occurred')
|
|
with patch.dict(lsscsi_size, {'retcode': 1, 'stderr': "lsscsi: invalid option -- 's'\nUsage:"}):
|
|
self.assertEqual(scsi.ls_(), "lsscsi: invalid option -- 's' - try get_size=False")
|
|
|
|
# get_size = False
|
|
cmd_mock = MagicMock(return_value=lsscsi)
|
|
with patch.dict(scsi.__salt__, {'cmd.run_all': cmd_mock}):
|
|
self.assertDictEqual(scsi.ls_(get_size=False), result)
|
|
|
|
mock = MagicMock(return_value=None)
|
|
with patch.object(salt.utils.path, 'which', mock):
|
|
self.assertEqual(scsi.ls_(), 'scsi.ls not available - lsscsi command not found')
|
|
|
|
def test_rescan_all(self):
|
|
'''
|
|
Test for list scsi devices
|
|
'''
|
|
mock = MagicMock(side_effect=[False, True])
|
|
with patch.object(os.path, 'isdir', mock):
|
|
self.assertEqual(scsi.rescan_all('host'),
|
|
'Host host does not exist')
|
|
|
|
with patch.dict(scsi.__salt__,
|
|
{'cmd.run': MagicMock(return_value='A')}):
|
|
self.assertListEqual(scsi.rescan_all('host'), ['A'])
|