2015-01-30 12:52:27 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
'''
|
|
|
|
:codeauthor: :email:`Rupesh Tare <rupesht@saltstack.com>`
|
|
|
|
'''
|
|
|
|
|
2015-01-30 23:37:00 +00:00
|
|
|
# Import Python libs
|
2018-01-20 18:13:46 +00:00
|
|
|
from __future__ import absolute_import, print_function, unicode_literals
|
2015-01-30 23:37:00 +00:00
|
|
|
|
2015-01-30 12:52:27 +00:00
|
|
|
# Import Salt Testing Libs
|
2017-02-19 15:35:30 +00:00
|
|
|
from tests.support.mixins import LoaderModuleMockMixin
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import TestCase, skipIf
|
|
|
|
from tests.support.mock import (
|
2015-01-30 12:52:27 +00:00
|
|
|
MagicMock,
|
2016-02-29 18:17:52 +00:00
|
|
|
Mock,
|
2015-01-30 12:52:27 +00:00
|
|
|
patch,
|
|
|
|
NO_MOCK,
|
|
|
|
NO_MOCK_REASON
|
|
|
|
)
|
2018-01-30 16:03:58 +00:00
|
|
|
try:
|
|
|
|
import pytest
|
|
|
|
except ImportError as import_error:
|
|
|
|
pytest = None
|
2015-01-30 12:52:27 +00:00
|
|
|
|
|
|
|
# Import Salt Libs
|
2017-03-21 17:15:36 +00:00
|
|
|
import salt.modules.localemod as localemod
|
2016-01-25 19:30:09 +00:00
|
|
|
from salt.exceptions import CommandExecutionError
|
2018-01-30 16:32:14 +00:00
|
|
|
from salt.ext import six
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2018-01-30 16:03:58 +00:00
|
|
|
@skipIf(not pytest, False)
|
2015-01-30 12:52:27 +00:00
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
2017-02-19 15:35:30 +00:00
|
|
|
class LocalemodTestCase(TestCase, LoaderModuleMockMixin):
|
2015-01-30 12:52:27 +00:00
|
|
|
'''
|
|
|
|
Test cases for salt.modules.localemod
|
|
|
|
'''
|
2017-03-22 12:12:36 +00:00
|
|
|
def setup_loader_modules(self):
|
|
|
|
return {localemod: {}}
|
2017-02-19 15:35:30 +00:00
|
|
|
|
2015-01-30 12:52:27 +00:00
|
|
|
def test_list_avail(self):
|
|
|
|
'''
|
|
|
|
Test for Lists available (compiled) locales
|
|
|
|
'''
|
|
|
|
with patch.dict(localemod.__salt__,
|
|
|
|
{'cmd.run': MagicMock(return_value='A\nB')}):
|
|
|
|
self.assertEqual(localemod.list_avail(), ['A', 'B'])
|
|
|
|
|
2018-01-30 16:04:37 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Ubuntu', 'osmajorrelease': 42})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod._parse_dbus_locale', MagicMock(return_value={'LANG': 'en_US.utf8'}))
|
|
|
|
@patch('salt.modules.localemod._localectl_status', MagicMock(return_value={'system_locale': {'LANG': 'de_DE.utf8'}}))
|
2018-01-30 16:23:40 +00:00
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=True))
|
2018-01-30 16:04:37 +00:00
|
|
|
def test_get_locale_with_systemd_nodbus(self):
|
|
|
|
'''
|
2018-01-30 16:17:46 +00:00
|
|
|
Test getting current system locale with systemd but no dbus available.
|
2018-01-30 16:04:37 +00:00
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
assert localemod.get_locale() == 'de_DE.utf8'
|
|
|
|
|
2018-01-30 16:06:10 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Ubuntu', 'osmajorrelease': 42})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', True)
|
|
|
|
@patch('salt.modules.localemod._parse_dbus_locale', MagicMock(return_value={'LANG': 'en_US.utf8'}))
|
|
|
|
@patch('salt.modules.localemod._localectl_status', MagicMock(return_value={'system_locale': {'LANG': 'de_DE.utf8'}}))
|
2018-01-30 16:23:40 +00:00
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=True))
|
2018-01-30 16:06:10 +00:00
|
|
|
def test_get_locale_with_systemd_and_dbus(self):
|
|
|
|
'''
|
|
|
|
Test getting current system locale with systemd and dbus available.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
assert localemod.get_locale() == 'en_US.utf8'
|
|
|
|
|
2018-01-30 16:18:13 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Suse', 'osmajorrelease': 12})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', True)
|
|
|
|
@patch('salt.modules.localemod._parse_dbus_locale', MagicMock(return_value={'LANG': 'en_US.utf8'}))
|
|
|
|
@patch('salt.modules.localemod._localectl_status', MagicMock(return_value={'system_locale': {'LANG': 'de_DE.utf8'}}))
|
2018-01-30 16:23:40 +00:00
|
|
|
@patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock()})
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=True))
|
2018-01-30 16:18:13 +00:00
|
|
|
def test_get_locale_with_systemd_and_dbus_sle12(self):
|
|
|
|
'''
|
|
|
|
Test getting current system locale with systemd and dbus available on SLE12.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
localemod.get_locale()
|
|
|
|
assert localemod.__salt__['cmd.run'].call_args[0][0] == 'grep "^RC_LANG" /etc/sysconfig/language'
|
|
|
|
|
2018-01-30 16:24:04 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value=None))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'RedHat', 'osmajorrelease': 12})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock()})
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=False))
|
|
|
|
def test_get_locale_with_no_systemd_redhat(self):
|
|
|
|
'''
|
2018-01-30 16:26:05 +00:00
|
|
|
Test getting current system locale with systemd and dbus available on RedHat.
|
2018-01-30 16:24:04 +00:00
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
localemod.get_locale()
|
|
|
|
assert localemod.__salt__['cmd.run'].call_args[0][0] == 'grep "^LANG=" /etc/sysconfig/i18n'
|
|
|
|
|
2018-01-30 16:26:26 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value=None))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Debian', 'osmajorrelease': 12})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock()})
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=False))
|
|
|
|
def test_get_locale_with_no_systemd_debian(self):
|
|
|
|
'''
|
|
|
|
Test getting current system locale with systemd and dbus available on Debian.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
localemod.get_locale()
|
|
|
|
assert localemod.__salt__['cmd.run'].call_args[0][0] == 'grep "^LANG=" /etc/default/locale'
|
|
|
|
|
2018-01-30 16:27:26 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value=None))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Gentoo', 'osmajorrelease': 12})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock()})
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=False))
|
|
|
|
def test_get_locale_with_no_systemd_gentoo(self):
|
|
|
|
'''
|
|
|
|
Test getting current system locale with systemd and dbus available on Gentoo.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
localemod.get_locale()
|
|
|
|
assert localemod.__salt__['cmd.run'].call_args[0][0] == 'eselect --brief locale show'
|
|
|
|
|
2018-01-30 16:28:28 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value=None))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Solaris', 'osmajorrelease': 12})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock()})
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=False))
|
|
|
|
def test_get_locale_with_no_systemd_slowlaris(self):
|
|
|
|
'''
|
|
|
|
Test getting current system locale with systemd and dbus available on Solaris.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
localemod.get_locale()
|
|
|
|
assert localemod.__salt__['cmd.run'].call_args[0][0] == 'grep "^LANG=" /etc/default/init'
|
|
|
|
|
2018-01-30 16:32:14 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value=None))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'BSD', 'osmajorrelease': 8, 'oscodename': 'DrunkDragon'})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod.__salt__', {'cmd.run': MagicMock()})
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=False))
|
|
|
|
def test_get_locale_with_no_systemd_unknown(self):
|
2015-01-30 12:52:27 +00:00
|
|
|
'''
|
2018-01-30 16:32:14 +00:00
|
|
|
Test getting current system locale with systemd and dbus available on Gentoo.
|
|
|
|
:return:
|
2015-01-30 12:52:27 +00:00
|
|
|
'''
|
2018-01-30 16:32:14 +00:00
|
|
|
with pytest.raises(CommandExecutionError) as err:
|
|
|
|
localemod.get_locale()
|
|
|
|
assert '"DrunkDragon" is unsupported' in six.text_type(err)
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2018-01-30 17:31:44 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Ubuntu', 'osmajorrelease': 42})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=True))
|
|
|
|
@patch('salt.modules.localemod._localectl_set', MagicMock())
|
|
|
|
def test_set_locale_with_systemd_nodbus(self):
|
|
|
|
'''
|
|
|
|
Test setting current system locale with systemd but no dbus available.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
loc = 'de_DE.utf8'
|
|
|
|
localemod.set_locale(loc)
|
|
|
|
assert localemod._localectl_set.call_args[0][0] == 'de_DE.utf8'
|
|
|
|
|
2018-01-30 17:34:06 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Ubuntu', 'osmajorrelease': 42})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', True)
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=True))
|
|
|
|
@patch('salt.modules.localemod._localectl_set', MagicMock())
|
|
|
|
def test_set_locale_with_systemd_and_dbus(self):
|
|
|
|
'''
|
|
|
|
Test setting current system locale with systemd and dbus available.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
loc = 'de_DE.utf8'
|
|
|
|
localemod.set_locale(loc)
|
|
|
|
assert localemod._localectl_set.call_args[0][0] == 'de_DE.utf8'
|
|
|
|
|
2018-01-30 17:43:01 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'Suse', 'osmajorrelease': 12})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', True)
|
|
|
|
@patch('salt.modules.localemod.__salt__', MagicMock())
|
|
|
|
@patch('salt.modules.localemod._localectl_set', MagicMock())
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=True))
|
|
|
|
def test_set_locale_with_systemd_and_dbus_sle12(self):
|
|
|
|
'''
|
|
|
|
Test setting current system locale with systemd and dbus available on SLE12.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
loc = 'de_DE.utf8'
|
|
|
|
localemod.set_locale(loc)
|
|
|
|
assert not localemod._localectl_set.called
|
|
|
|
assert localemod.__salt__['file.replace'].called
|
|
|
|
assert localemod.__salt__['file.replace'].call_args[0][0] == '/etc/sysconfig/language'
|
|
|
|
assert localemod.__salt__['file.replace'].call_args[0][1] == '^RC_LANG=.*'
|
|
|
|
assert localemod.__salt__['file.replace'].call_args[0][2] == 'RC_LANG="{}"'.format(loc)
|
|
|
|
|
2018-01-30 17:45:55 +00:00
|
|
|
@patch('salt.utils.which', MagicMock(return_value="/usr/bin/localctl"))
|
|
|
|
@patch('salt.modules.localemod.__grains__', {'os_family': 'RedHat', 'osmajorrelease': 42})
|
|
|
|
@patch('salt.modules.localemod.HAS_DBUS', False)
|
|
|
|
@patch('salt.modules.localemod.__salt__', MagicMock())
|
|
|
|
@patch('salt.modules.localemod._localectl_set', MagicMock())
|
|
|
|
@patch('salt.utils.systemd.booted', MagicMock(return_value=False))
|
|
|
|
def test_set_locale_with_no_systemd_redhat(self):
|
|
|
|
'''
|
|
|
|
Test setting current system locale with systemd and dbus available on RedHat.
|
|
|
|
:return:
|
|
|
|
'''
|
|
|
|
loc = 'de_DE.utf8'
|
|
|
|
localemod.set_locale(loc)
|
|
|
|
assert not localemod._localectl_set.called
|
|
|
|
assert localemod.__salt__['file.replace'].called
|
|
|
|
assert localemod.__salt__['file.replace'].call_args[0][0] == '/etc/sysconfig/i18n'
|
|
|
|
assert localemod.__salt__['file.replace'].call_args[0][1] == '^LANG=.*'
|
|
|
|
assert localemod.__salt__['file.replace'].call_args[0][2] == 'LANG="{}"'.format(loc)
|
|
|
|
|
2018-01-30 17:31:44 +00:00
|
|
|
def _test_set_locale(self):
|
2015-01-30 12:52:27 +00:00
|
|
|
def test_set_locale(self):
|
|
|
|
'''
|
|
|
|
Test for Sets the current system locale
|
|
|
|
'''
|
2016-08-18 19:31:26 +00:00
|
|
|
with patch.dict(localemod.__context__, {'salt.utils.systemd.booted': True}):
|
2017-05-19 11:28:52 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os_family': ['Unknown']}):
|
|
|
|
with patch.object(localemod, '_localectl_set', return_value=True):
|
|
|
|
self.assertTrue(localemod.set_locale('l'))
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2016-08-19 02:56:20 +00:00
|
|
|
with patch.dict(localemod.__context__, {'salt.utils.systemd.booted': False}):
|
2016-02-29 18:17:52 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os_family': ['Gentoo']}):
|
|
|
|
with patch.dict(localemod.__salt__, {'cmd.retcode': MagicMock(return_value='A')}):
|
2016-08-21 07:22:09 +00:00
|
|
|
with patch.object(localemod,
|
|
|
|
'_parse_localectl',
|
|
|
|
return_value={'LANG': 'B'}):
|
|
|
|
self.assertFalse(localemod.set_locale('l'))
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2016-02-29 18:17:52 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os_family': ['A']}):
|
2016-08-20 13:42:23 +00:00
|
|
|
with patch.dict(localemod.__salt__, {'cmd.retcode': MagicMock(return_value=0)}):
|
|
|
|
with patch('salt.utils.systemd.booted', return_value=False):
|
|
|
|
self.assertRaises(CommandExecutionError, localemod.set_locale, 'A')
|
2015-09-03 01:22:42 +00:00
|
|
|
|
2015-01-30 12:52:27 +00:00
|
|
|
def test_avail(self):
|
|
|
|
'''
|
|
|
|
Test for Check if a locale is available
|
|
|
|
'''
|
2015-04-29 04:03:48 +00:00
|
|
|
with patch('salt.utils.locales.normalize_locale',
|
|
|
|
MagicMock(return_value='en_US.UTF-8 UTF-8')):
|
2015-01-30 12:52:27 +00:00
|
|
|
with patch.dict(localemod.__salt__,
|
|
|
|
{'locale.list_avail':
|
|
|
|
MagicMock(return_value=['A', 'B'])}):
|
|
|
|
self.assertTrue(localemod.avail('locale'))
|
|
|
|
|
2015-01-31 00:23:32 +00:00
|
|
|
def test_gen_locale_not_valid(self):
|
|
|
|
'''
|
|
|
|
Tests the return of gen_locale when the provided locale is not found
|
|
|
|
'''
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os': 'Debian'}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch.dict(localemod.__salt__,
|
2015-02-06 19:20:04 +00:00
|
|
|
{'file.search': MagicMock(return_value=False)}):
|
2017-04-10 13:00:57 +00:00
|
|
|
self.assertFalse(localemod.gen_locale('foo'))
|
2015-01-31 00:23:32 +00:00
|
|
|
|
2015-03-17 21:13:23 +00:00
|
|
|
def test_gen_locale_debian(self):
|
2015-01-31 00:23:32 +00:00
|
|
|
'''
|
|
|
|
Tests the return of successful gen_locale on Debian system
|
|
|
|
'''
|
2015-04-18 17:57:34 +00:00
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os': 'Debian'}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch.dict(localemod.__salt__,
|
|
|
|
{'file.search': MagicMock(return_value=True),
|
|
|
|
'file.replace': MagicMock(return_value=True),
|
|
|
|
'cmd.run_all': MagicMock(return_value=ret)}):
|
|
|
|
self.assertTrue(localemod.gen_locale('en_US.UTF-8 UTF-8'))
|
2015-01-31 00:23:32 +00:00
|
|
|
|
2015-05-22 16:48:30 +00:00
|
|
|
def test_gen_locale_debian_no_charmap(self):
|
|
|
|
'''
|
|
|
|
Tests the return of successful gen_locale on Debian system without a charmap
|
|
|
|
'''
|
2015-07-23 13:17:18 +00:00
|
|
|
def file_search(search, pattern, flags):
|
2015-05-22 16:48:30 +00:00
|
|
|
'''
|
|
|
|
mock file.search
|
|
|
|
'''
|
|
|
|
if len(pattern.split()) == 1:
|
|
|
|
return False
|
|
|
|
else: # charmap was supplied
|
|
|
|
return True
|
|
|
|
|
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os': 'Debian'}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch.dict(localemod.__salt__,
|
|
|
|
{'file.search': file_search,
|
|
|
|
'file.replace': MagicMock(return_value=True),
|
|
|
|
'cmd.run_all': MagicMock(return_value=ret)}):
|
|
|
|
self.assertTrue(localemod.gen_locale('en_US.UTF-8'))
|
2015-05-22 16:48:30 +00:00
|
|
|
|
2015-01-31 00:23:32 +00:00
|
|
|
def test_gen_locale_ubuntu(self):
|
|
|
|
'''
|
|
|
|
Test the return of successful gen_locale on Ubuntu system
|
|
|
|
'''
|
2015-04-18 17:57:34 +00:00
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2015-01-30 12:52:27 +00:00
|
|
|
with patch.dict(localemod.__salt__,
|
|
|
|
{'file.replace': MagicMock(return_value=True),
|
|
|
|
'file.touch': MagicMock(return_value=None),
|
|
|
|
'file.append': MagicMock(return_value=None),
|
2017-04-10 13:00:57 +00:00
|
|
|
'cmd.run_all': MagicMock(return_value=ret)}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch('os.listdir', MagicMock(return_value=['en_US'])), \
|
|
|
|
patch.dict(localemod.__grains__, {'os': 'Ubuntu'}):
|
|
|
|
self.assertTrue(localemod.gen_locale('en_US.UTF-8'))
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2015-01-31 00:23:32 +00:00
|
|
|
def test_gen_locale_gentoo(self):
|
|
|
|
'''
|
|
|
|
Tests the return of successful gen_locale on Gentoo system
|
|
|
|
'''
|
2015-04-18 17:57:34 +00:00
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os_family': 'Gentoo'}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch('os.listdir', MagicMock(return_value=['en_US.UTF-8'])), \
|
|
|
|
patch.dict(localemod.__salt__,
|
|
|
|
{'file.search': MagicMock(return_value=True),
|
|
|
|
'file.replace': MagicMock(return_value=True),
|
|
|
|
'cmd.run_all': MagicMock(return_value=ret)}):
|
|
|
|
self.assertTrue(localemod.gen_locale('en_US.UTF-8 UTF-8'))
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2015-05-22 16:48:30 +00:00
|
|
|
def test_gen_locale_gentoo_no_charmap(self):
|
|
|
|
'''
|
|
|
|
Tests the return of successful gen_locale on Gentoo system without a charmap
|
|
|
|
'''
|
2015-07-23 13:17:18 +00:00
|
|
|
def file_search(search, pattern, flags):
|
2015-05-22 16:48:30 +00:00
|
|
|
'''
|
|
|
|
mock file.search
|
|
|
|
'''
|
|
|
|
if len(pattern.split()) == 1:
|
|
|
|
return False
|
|
|
|
else: # charmap was supplied
|
|
|
|
return True
|
|
|
|
|
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2017-04-10 13:00:57 +00:00
|
|
|
with patch.dict(localemod.__grains__, {'os_family': 'Gentoo'}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch('os.listdir', MagicMock(return_value=['en_US.UTF-8'])), \
|
|
|
|
patch.dict(localemod.__salt__,
|
|
|
|
{'file.search': file_search,
|
|
|
|
'file.replace': MagicMock(return_value=True),
|
|
|
|
'cmd.run_all': MagicMock(return_value=ret)}):
|
|
|
|
self.assertTrue(localemod.gen_locale('en_US.UTF-8'))
|
2015-05-22 16:48:30 +00:00
|
|
|
|
2015-01-31 00:23:32 +00:00
|
|
|
def test_gen_locale(self):
|
|
|
|
'''
|
|
|
|
Tests the return of successful gen_locale
|
|
|
|
'''
|
2015-04-18 17:57:34 +00:00
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2015-01-31 00:23:32 +00:00
|
|
|
with patch.dict(localemod.__salt__,
|
2015-05-15 18:50:55 +00:00
|
|
|
{'cmd.run_all': MagicMock(return_value=ret),
|
2017-04-10 13:00:57 +00:00
|
|
|
'file.replace': MagicMock()}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch('os.listdir', MagicMock(return_value=['en_US'])):
|
2015-04-18 17:57:34 +00:00
|
|
|
self.assertTrue(localemod.gen_locale('en_US.UTF-8'))
|
2015-03-17 21:13:23 +00:00
|
|
|
|
|
|
|
def test_gen_locale_verbose(self):
|
|
|
|
'''
|
|
|
|
Tests the return of successful gen_locale
|
|
|
|
'''
|
2015-04-18 17:57:34 +00:00
|
|
|
ret = {'stdout': 'saltines', 'stderr': 'biscuits', 'retcode': 0, 'pid': 1337}
|
2015-03-17 21:13:23 +00:00
|
|
|
with patch.dict(localemod.__salt__,
|
2015-05-15 18:50:55 +00:00
|
|
|
{'cmd.run_all': MagicMock(return_value=ret),
|
2017-04-10 13:00:57 +00:00
|
|
|
'file.replace': MagicMock()}), \
|
Use explicit unicode strings + break up salt.utils
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.
2017-07-25 01:47:15 +00:00
|
|
|
patch('salt.utils.path.which', MagicMock(return_value='/some/dir/path')), \
|
2017-04-10 13:00:57 +00:00
|
|
|
patch('os.listdir', MagicMock(return_value=['en_US'])):
|
2015-03-17 21:13:23 +00:00
|
|
|
self.assertEqual(localemod.gen_locale('en_US.UTF-8', verbose=True), ret)
|
2015-01-30 12:52:27 +00:00
|
|
|
|
2016-02-29 18:17:52 +00:00
|
|
|
def test_parse_localectl(self):
|
|
|
|
localectl_out = (' System Locale: LANG=en_US.UTF-8\n'
|
|
|
|
' LANGUAGE=en_US:en\n'
|
|
|
|
' VC Keymap: n/a')
|
|
|
|
mock_cmd = Mock(return_value=localectl_out)
|
|
|
|
with patch.dict(localemod.__salt__, {'cmd.run': mock_cmd}):
|
2018-01-30 16:32:37 +00:00
|
|
|
ret = localemod._localectl_status()['system_locale']
|
2016-02-29 18:17:52 +00:00
|
|
|
self.assertEqual({'LANG': 'en_US.UTF-8', 'LANGUAGE': 'en_US:en'}, ret)
|