mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +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.
61 lines
2.2 KiB
Python
61 lines
2.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import (
|
|
requires_salt_modules,
|
|
destructiveTest,
|
|
)
|
|
|
|
# Import Salt libs
|
|
import salt.utils.platform
|
|
|
|
|
|
def _find_new_locale(current_locale):
|
|
for locale in ['en_US.UTF-8', 'de_DE.UTF-8', 'fr_FR.UTF-8']:
|
|
if locale != current_locale:
|
|
return locale
|
|
|
|
|
|
@skipIf(salt.utils.platform.is_windows(), 'minion is windows')
|
|
@skipIf(salt.utils.platform.is_darwin(), 'locale method is not supported on mac')
|
|
@requires_salt_modules('locale')
|
|
class LocaleModuleTest(ModuleCase):
|
|
def test_get_locale(self):
|
|
locale = self.run_function('locale.get_locale')
|
|
self.assertNotIn('Unsupported platform!', locale)
|
|
|
|
@destructiveTest
|
|
def test_gen_locale(self):
|
|
# Make sure charmaps are available on test system before attempting
|
|
# call gen_locale. We log this error to the user in the function, but
|
|
# we don't want to fail this test if this is missing on the test system.
|
|
char_maps = self.run_function('cmd.run_all', ['locale -m'])
|
|
if char_maps['stdout'] == '':
|
|
self.skipTest('locale charmaps not available. Skipping test.')
|
|
|
|
if char_maps['retcode'] and char_maps['stderr']:
|
|
self.skipTest('{0}. Cannot generate locale. Skipping test.'.format(
|
|
char_maps['stderr'])
|
|
)
|
|
|
|
locale = self.run_function('locale.get_locale')
|
|
new_locale = _find_new_locale(locale)
|
|
ret = self.run_function('locale.gen_locale', [new_locale])
|
|
self.assertTrue(ret)
|
|
|
|
@destructiveTest
|
|
def test_set_locale(self):
|
|
original_locale = self.run_function('locale.get_locale')
|
|
locale_to_set = _find_new_locale(original_locale)
|
|
self.run_function('locale.gen_locale', [locale_to_set])
|
|
ret = self.run_function('locale.set_locale', [locale_to_set])
|
|
new_locale = self.run_function('locale.get_locale')
|
|
self.assertTrue(ret)
|
|
self.assertEqual(locale_to_set, new_locale)
|
|
self.run_function('locale.set_locale', [original_locale])
|