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.
81 lines
2.9 KiB
Python
81 lines
2.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.paths import FILES
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import requires_network
|
|
|
|
# Import Salt libs
|
|
import salt.utils.path
|
|
from tests.unit.modules.test_zcbuildout import Base, KNOWN_VIRTUALENV_BINARY_NAMES
|
|
import salt.modules.zcbuildout as modbuildout
|
|
import salt.states.zcbuildout as buildout
|
|
import salt.modules.cmdmod as cmd
|
|
|
|
ROOT = os.path.join(FILES, 'file/base/buildout')
|
|
|
|
|
|
@skipIf(salt.utils.path.which_bin(KNOWN_VIRTUALENV_BINARY_NAMES) is None,
|
|
'The \'virtualenv\' packaged needs to be installed')
|
|
class BuildoutTestCase(Base):
|
|
|
|
def setup_loader_modules(self):
|
|
module_globals = {
|
|
'__env__': 'base',
|
|
'__opts__': {'test': False},
|
|
'__salt__': {
|
|
'cmd.run_all': cmd.run_all,
|
|
'cmd.run': cmd.run,
|
|
'cmd.retcode': cmd.retcode,
|
|
'buildout.buildout': modbuildout.buildout,
|
|
}
|
|
}
|
|
return {buildout: module_globals, modbuildout: module_globals}
|
|
|
|
@requires_network()
|
|
def test_quiet(self):
|
|
c_dir = os.path.join(self.tdir, 'c')
|
|
cret = buildout.installed(c_dir, python=self.py_st, quiet=True)
|
|
self.assertTrue(cret['result'])
|
|
self.assertFalse('OUTPUT:' in cret['comment'])
|
|
self.assertFalse('Log summary:' in cret['comment'])
|
|
|
|
@requires_network()
|
|
def test_error(self):
|
|
b_dir = os.path.join(self.tdir, 'e')
|
|
ret = buildout.installed(b_dir, python=self.py_st)
|
|
self.assertTrue(
|
|
'We did not get any expectable '
|
|
'answer from buildout'
|
|
in ret['comment'])
|
|
self.assertTrue(
|
|
'An internal error occurred due to a bug in'
|
|
' either zc.buildout '
|
|
in ret['comment'])
|
|
self.assertFalse(ret['result'])
|
|
|
|
@requires_network()
|
|
def test_installed(self):
|
|
b_dir = os.path.join(self.tdir, 'b')
|
|
ret = buildout.installed(b_dir,
|
|
python=self.py_st,
|
|
onlyif='/bin/false')
|
|
self.assertEqual(ret['comment'], '\nonlyif execution failed')
|
|
self.assertEqual(ret['result'], True)
|
|
self.assertTrue('/b' in ret['name'])
|
|
b_dir = os.path.join(self.tdir, 'b')
|
|
ret = buildout.installed(b_dir,
|
|
python=self.py_st,
|
|
unless='/bin/true')
|
|
self.assertEqual(ret['comment'], '\nunless execution succeeded')
|
|
self.assertEqual(ret['result'], True)
|
|
self.assertTrue('/b' in ret['name'])
|
|
ret = buildout.installed(b_dir, python=self.py_st)
|
|
self.assertEqual(ret['result'], True)
|
|
self.assertTrue('OUTPUT:' in ret['comment'])
|
|
self.assertTrue('Log summary:' in ret['comment'])
|