mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +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.
77 lines
2.7 KiB
Python
77 lines
2.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Ted Strzalkowski (tedski@gmail.com)`
|
|
|
|
|
|
tests.unit.modules.mdadm_test
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# 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.mdadm as mdadm
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class MdadmTestCase(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
return {mdadm: {}}
|
|
|
|
def test_create(self):
|
|
mock = MagicMock(return_value='salt')
|
|
with patch.dict(mdadm.__salt__, {'cmd.run': mock}), \
|
|
patch('salt.utils.path.which', lambda exe: exe):
|
|
ret = mdadm.create(
|
|
'/dev/md0', 5,
|
|
devices=['/dev/sdb1', '/dev/sdc1', '/dev/sdd1'],
|
|
test_mode=False,
|
|
force=True,
|
|
chunk=256
|
|
)
|
|
self.assertEqual('salt', ret)
|
|
|
|
self.assert_called_once(mock)
|
|
|
|
args, kwargs = mock.call_args
|
|
# expected cmd is
|
|
# mdadm -C /dev/md0 -R -v --chunk 256 --force -l 5 -e default -n 3 /dev/sdb1 /dev/sdc1 /dev/sdd1
|
|
# where args between -v and -l could be in any order
|
|
self.assertEqual(len(args), 1)
|
|
self.assertEqual(len(args[0]), 17)
|
|
self.assertEqual(args[0][:5], [
|
|
'mdadm',
|
|
'-C', '/dev/md0',
|
|
'-R',
|
|
'-v'])
|
|
self.assertEqual(args[0][8:], [
|
|
'-l', '5',
|
|
'-e', 'default',
|
|
'-n', '3',
|
|
'/dev/sdb1', '/dev/sdc1', '/dev/sdd1'])
|
|
self.assertEqual(sorted(args[0][5:8]), sorted(['--chunk', '256', '--force']))
|
|
self.assertIn('--chunk 256', ' '.join(args[0][5:8]))
|
|
self.assertEqual(kwargs, {'python_shell': False})
|
|
|
|
def test_create_test_mode(self):
|
|
mock = MagicMock()
|
|
with patch.dict(mdadm.__salt__, {'cmd.run': mock}):
|
|
ret = mdadm.create(
|
|
'/dev/md0', 5,
|
|
devices=['/dev/sdb1', '/dev/sdc1', '/dev/sdd1'],
|
|
force=True,
|
|
chunk=256,
|
|
test_mode=True
|
|
)
|
|
self.assertEqual(sorted('mdadm -C /dev/md0 -R -v --chunk 256 '
|
|
'--force -l 5 -e default -n 3 '
|
|
'/dev/sdb1 /dev/sdc1 /dev/sdd1'.split()), sorted(ret.split()))
|
|
assert not mock.called, 'test mode failed, cmd.run called'
|