mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +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.
117 lines
3.0 KiB
Python
117 lines
3.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import TestCase, skipIf
|
|
from tests.support.mixins import AdaptedConfigurationTestCaseMixin
|
|
|
|
# Import Salt libs
|
|
import salt.auth
|
|
import salt.wheel
|
|
import salt.utils.platform
|
|
|
|
|
|
class WheelModuleTest(TestCase, AdaptedConfigurationTestCaseMixin):
|
|
|
|
eauth_creds = {
|
|
'username': 'saltdev_auto',
|
|
'password': 'saltdev',
|
|
'eauth': 'auto',
|
|
}
|
|
|
|
def setUp(self):
|
|
'''
|
|
Configure an eauth user to test with
|
|
'''
|
|
self.wheel = salt.wheel.Wheel(dict(self.get_config('client_config')))
|
|
|
|
def tearDown(self):
|
|
del self.wheel
|
|
|
|
def test_master_call(self):
|
|
'''
|
|
Test executing master_call with lowdata
|
|
|
|
The choice of using key.list_all for this is arbitrary and should be
|
|
changed to some mocked function that is more testing friendly.
|
|
'''
|
|
low = {
|
|
'client': 'wheel',
|
|
'fun': 'key.list_all',
|
|
'print_event': False
|
|
}
|
|
low.update(self.eauth_creds)
|
|
|
|
self.wheel.master_call(**low)
|
|
|
|
def test_token(self):
|
|
'''
|
|
Test executing master_call with lowdata
|
|
|
|
The choice of using key.list_all for this is arbitrary and should be
|
|
changed to some mocked function that is more testing friendly.
|
|
'''
|
|
auth = salt.auth.LoadAuth(dict(self.get_config('client_config')))
|
|
token = auth.mk_token(self.eauth_creds)
|
|
|
|
token = auth.mk_token({
|
|
'username': 'saltdev_auto',
|
|
'password': 'saltdev',
|
|
'eauth': 'auto',
|
|
})
|
|
|
|
self.wheel.master_call(**{
|
|
'client': 'wheel',
|
|
'fun': 'key.list_all',
|
|
'token': token['token'],
|
|
'print_event': False,
|
|
})
|
|
|
|
def test_cmd_sync(self):
|
|
low = {
|
|
'client': 'wheel',
|
|
'fun': 'key.list_all',
|
|
'print_event': False,
|
|
}
|
|
low.update(self.eauth_creds)
|
|
|
|
self.wheel.cmd_sync(low)
|
|
|
|
# Remove this skipIf when Issue #39616 is resolved
|
|
# https://github.com/saltstack/salt/issues/39616
|
|
@skipIf(salt.utils.platform.is_windows(),
|
|
'Causes pickling error on Windows: Issue #39616')
|
|
def test_cmd_async(self):
|
|
low = {
|
|
'client': 'wheel_async',
|
|
'fun': 'key.list_all',
|
|
'print_event': False,
|
|
}
|
|
low.update(self.eauth_creds)
|
|
|
|
self.wheel.cmd_async(low)
|
|
|
|
def test_cmd_sync_w_arg(self):
|
|
low = {
|
|
'fun': 'key.finger',
|
|
'match': '*',
|
|
'print_event': False,
|
|
}
|
|
low.update(self.eauth_creds)
|
|
|
|
ret = self.wheel.cmd_sync(low)
|
|
self.assertIn('return', ret.get('data', {}))
|
|
|
|
def test_wildcard_auth(self):
|
|
low = {
|
|
'username': 'the_s0und_of_t3ch',
|
|
'password': 'willrockyou',
|
|
'eauth': 'auto',
|
|
'fun': 'key.list_all',
|
|
'print_event': False,
|
|
}
|
|
|
|
self.wheel.cmd_sync(low)
|