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.
84 lines
3.4 KiB
Python
84 lines
3.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Rupesh Tare <rupesht@saltstack.com>`
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.mock import (
|
|
MagicMock,
|
|
patch,
|
|
NO_MOCK,
|
|
NO_MOCK_REASON
|
|
)
|
|
|
|
# Import Salt Libs
|
|
import salt.modules.genesis as genesis
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class GenesisTestCase(TestCase, LoaderModuleMockMixin):
|
|
'''
|
|
Test cases for salt.modules.genesis
|
|
'''
|
|
def setup_loader_modules(self):
|
|
return {genesis: {}}
|
|
|
|
def test_bootstrap(self):
|
|
'''
|
|
Test for Create an image for a specific platform.
|
|
'''
|
|
mock = MagicMock(return_value=False)
|
|
with patch.dict(genesis.__salt__, {'file.directory_exists': mock}):
|
|
mock = MagicMock(side_effect=Exception('foo'))
|
|
with patch.dict(genesis.__salt__, {'file.mkdir': mock}):
|
|
self.assertEqual(genesis.bootstrap('platform', 'root'),
|
|
{'Error': "Exception('foo',)"})
|
|
|
|
with patch.object(genesis, '_bootstrap_yum', return_value='A'):
|
|
with patch.dict(genesis.__salt__, {'mount.umount': MagicMock(),
|
|
'file.rmdir': MagicMock(),
|
|
'file.directory_exists': MagicMock()}):
|
|
with patch.dict(genesis.__salt__, {'disk.blkid': MagicMock(return_value={})}):
|
|
self.assertEqual(genesis.bootstrap('rpm', 'root', 'dir'), None)
|
|
|
|
with patch.object(genesis, '_bootstrap_deb', return_value='A'):
|
|
with patch.dict(genesis.__salt__, {'mount.umount': MagicMock(),
|
|
'file.rmdir': MagicMock(),
|
|
'file.directory_exists': MagicMock()}):
|
|
with patch.dict(genesis.__salt__, {'disk.blkid': MagicMock(return_value={})}):
|
|
self.assertEqual(genesis.bootstrap('deb', 'root', 'dir'), None)
|
|
|
|
with patch.object(genesis, '_bootstrap_pacman', return_value='A') as pacman_patch:
|
|
with patch.dict(genesis.__salt__, {'mount.umount': MagicMock(),
|
|
'file.rmdir': MagicMock(),
|
|
'file.directory_exists': MagicMock(),
|
|
'disk.blkid': MagicMock(return_value={})}):
|
|
genesis.bootstrap('pacman', 'root', 'dir')
|
|
pacman_patch.assert_called_with('root', img_format='dir', exclude_pkgs=[], pkgs=[])
|
|
|
|
def test_avail_platforms(self):
|
|
'''
|
|
Test for Return which platforms are available
|
|
'''
|
|
with patch('salt.utils.path.which', MagicMock(return_value=False)):
|
|
self.assertFalse(genesis.avail_platforms()['deb'])
|
|
|
|
def test_pack(self):
|
|
'''
|
|
Test for Pack up a directory structure, into a specific format
|
|
'''
|
|
with patch.object(genesis, '_tar', return_value='tar'):
|
|
self.assertEqual(genesis.pack('name', 'root'), None)
|
|
|
|
def test_unpack(self):
|
|
'''
|
|
Test for Unpack an image into a directory structure
|
|
'''
|
|
with patch.object(genesis, '_untar', return_value='untar'):
|
|
self.assertEqual(genesis.unpack('name', 'root'), None)
|