mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +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.
119 lines
5.4 KiB
Python
119 lines
5.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# 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.states.rvm as rvm
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class TestRvmState(TestCase, LoaderModuleMockMixin):
|
|
|
|
def setup_loader_modules(self):
|
|
return {
|
|
rvm: {
|
|
'__opts__': {'test': False},
|
|
'__salt__': {
|
|
'cmd.has_exec': MagicMock(return_value=True),
|
|
'config.option': MagicMock(return_value=None)
|
|
}
|
|
}
|
|
}
|
|
|
|
def test__check_rvm(self):
|
|
mock = MagicMock(return_value=True)
|
|
with patch.dict(
|
|
rvm.__salt__,
|
|
{'rvm.is_installed': MagicMock(return_value=False),
|
|
'rvm.install': mock}):
|
|
rvm._check_rvm({'changes': {}})
|
|
# rvm.install is not run anymore while checking rvm.is_installed
|
|
self.assertEqual(mock.call_count, 0)
|
|
|
|
def test__check_and_install_ruby(self):
|
|
mock_check_rvm = MagicMock(
|
|
return_value={'changes': {}, 'result': True})
|
|
mock_check_ruby = MagicMock(
|
|
return_value={'changes': {}, 'result': False})
|
|
mock_install_ruby = MagicMock(return_value='')
|
|
with patch.object(rvm, '_check_rvm', new=mock_check_rvm):
|
|
with patch.object(rvm, '_check_ruby', new=mock_check_ruby):
|
|
with patch.dict(rvm.__salt__,
|
|
{'rvm.install_ruby': mock_install_ruby}):
|
|
rvm._check_and_install_ruby({'changes': {}}, '1.9.3')
|
|
mock_install_ruby.assert_called_once_with('1.9.3', runas=None, opts=None, env=None)
|
|
|
|
def test__check_ruby(self):
|
|
mock = MagicMock(return_value=[['ruby', '1.9.3-p125', False],
|
|
['jruby', '1.6.5.1', True]])
|
|
with patch.dict(rvm.__salt__, {'rvm.list': mock}):
|
|
for ruby, result in six.iteritems({'1.9.3': True,
|
|
'ruby-1.9.3': True,
|
|
'ruby-1.9.3-p125': True,
|
|
'1.9.3-p125': True,
|
|
'1.9.3-p126': False,
|
|
'rbx': False,
|
|
'jruby': True,
|
|
'jruby-1.6.5.1': True,
|
|
'jruby-1.6': False,
|
|
'jruby-1.9.3': False,
|
|
'jruby-1.9.3-p125': False}):
|
|
ret = rvm._check_ruby({'changes': {}, 'result': False}, ruby)
|
|
self.assertEqual(result, ret['result'])
|
|
|
|
def test_gemset_present(self):
|
|
with patch.object(rvm, '_check_rvm') as mock_method:
|
|
mock_method.return_value = {'result': True, 'changes': {}}
|
|
gems = ['global', 'foo', 'bar']
|
|
gemset_list = MagicMock(return_value=gems)
|
|
gemset_create = MagicMock(return_value=True)
|
|
check_ruby = MagicMock(
|
|
return_value={'result': False, 'changes': {}})
|
|
with patch.object(rvm, '_check_ruby', new=check_ruby):
|
|
with patch.dict(rvm.__salt__,
|
|
{'rvm.gemset_list': gemset_list,
|
|
'rvm.gemset_create': gemset_create}):
|
|
ret = rvm.gemset_present('foo')
|
|
self.assertEqual(True, ret['result'])
|
|
|
|
ret = rvm.gemset_present('quux')
|
|
self.assertEqual(True, ret['result'])
|
|
gemset_create.assert_called_once_with(
|
|
'default', 'quux', runas=None)
|
|
|
|
def test_installed(self):
|
|
mock = MagicMock()
|
|
with patch.object(rvm, '_check_rvm') as mock_method:
|
|
mock_method.return_value = {'result': True}
|
|
with patch.object(rvm, '_check_and_install_ruby', new=mock):
|
|
rvm.installed('1.9.3', default=True)
|
|
mock.assert_called_once_with(
|
|
{'result': True}, '1.9.3', True, user=None, opts=None, env=None)
|
|
|
|
def test_installed_with_env(self):
|
|
mock = MagicMock()
|
|
with patch.object(rvm, '_check_rvm') as mock_method:
|
|
mock_method.return_value = {'result': True}
|
|
with patch.object(rvm, '_check_and_install_ruby', new=mock):
|
|
rvm.installed('1.9.3', default=True, env=[{'RUBY_CONFIGURE_OPTS': '--foobar'}])
|
|
mock.assert_called_once_with(
|
|
{'result': True}, '1.9.3', True, user=None, opts=None, env=[{'RUBY_CONFIGURE_OPTS': '--foobar'}])
|
|
|
|
def test_installed_with_opts(self):
|
|
mock = MagicMock()
|
|
with patch.object(rvm, '_check_rvm') as mock_method:
|
|
mock_method.return_value = {'result': True}
|
|
with patch.object(rvm, '_check_and_install_ruby', new=mock):
|
|
rvm.installed('1.9.3', default=True, opts=[{'-C': '--enable-shared,--with-readline-dir=$HOME/.rvm/usr'}])
|
|
mock.assert_called_once_with(
|
|
{'result': True}, '1.9.3', True, user=None, opts=[{'-C': '--enable-shared,--with-readline-dir=$HOME/.rvm/usr'}], env=None)
|