2013-11-29 00:37:39 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
2014-11-21 19:05:13 +00:00
|
|
|
|
|
|
|
# Import python libs
|
2018-01-26 12:43:11 +00:00
|
|
|
from __future__ import absolute_import, unicode_literals, print_function
|
2013-11-29 00:37:39 +00:00
|
|
|
import os
|
|
|
|
|
|
|
|
# Import Salt Testing libs
|
2017-02-19 15:35:30 +00:00
|
|
|
from tests.support.paths import FILES
|
2017-02-27 13:58:07 +00:00
|
|
|
from tests.support.unit import skipIf
|
2017-02-27 15:59:04 +00:00
|
|
|
from tests.support.helpers import requires_network
|
2013-11-29 00:37:39 +00:00
|
|
|
|
|
|
|
# Import Salt libs
|
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
|
|
|
import salt.utils.path
|
2017-02-27 15:59:04 +00:00
|
|
|
from tests.unit.modules.test_zcbuildout import Base, KNOWN_VIRTUALENV_BINARY_NAMES
|
2017-03-21 17:15:36 +00:00
|
|
|
import salt.modules.zcbuildout as modbuildout
|
|
|
|
import salt.states.zcbuildout as buildout
|
|
|
|
import salt.modules.cmdmod as cmd
|
2013-11-29 00:37:39 +00:00
|
|
|
|
2017-02-19 15:35:30 +00:00
|
|
|
ROOT = os.path.join(FILES, 'file/base/buildout')
|
2013-11-29 00:37:39 +00:00
|
|
|
|
|
|
|
|
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
|
|
|
@skipIf(salt.utils.path.which_bin(KNOWN_VIRTUALENV_BINARY_NAMES) is None,
|
2018-01-26 12:26:35 +00:00
|
|
|
"The 'virtualenv' packaged needs to be installed")
|
2013-11-29 00:37:39 +00:00
|
|
|
class BuildoutTestCase(Base):
|
|
|
|
|
2017-03-22 12:12:36 +00:00
|
|
|
def setup_loader_modules(self):
|
|
|
|
module_globals = {
|
2017-02-19 15:35:30 +00:00
|
|
|
'__env__': 'base',
|
|
|
|
'__opts__': {'test': False},
|
|
|
|
'__salt__': {
|
|
|
|
'cmd.run_all': cmd.run_all,
|
|
|
|
'cmd.run': cmd.run,
|
|
|
|
'cmd.retcode': cmd.retcode,
|
|
|
|
'buildout.buildout': modbuildout.buildout,
|
|
|
|
}
|
|
|
|
}
|
2017-03-22 12:12:36 +00:00
|
|
|
return {buildout: module_globals, modbuildout: module_globals}
|
2017-02-19 15:35:30 +00:00
|
|
|
|
2013-12-03 16:51:46 +00:00
|
|
|
@requires_network()
|
2013-11-29 00:37:39 +00:00
|
|
|
def test_quiet(self):
|
|
|
|
c_dir = os.path.join(self.tdir, 'c')
|
2013-12-22 17:39:07 +00:00
|
|
|
cret = buildout.installed(c_dir, python=self.py_st, quiet=True)
|
2013-11-29 00:37:39 +00:00
|
|
|
self.assertTrue(cret['result'])
|
|
|
|
self.assertFalse('OUTPUT:' in cret['comment'])
|
|
|
|
self.assertFalse('Log summary:' in cret['comment'])
|
|
|
|
|
2013-12-03 16:51:46 +00:00
|
|
|
@requires_network()
|
2013-11-29 00:37:39 +00:00
|
|
|
def test_error(self):
|
|
|
|
b_dir = os.path.join(self.tdir, 'e')
|
2013-12-22 17:39:07 +00:00
|
|
|
ret = buildout.installed(b_dir, python=self.py_st)
|
2013-11-29 00:37:39 +00:00
|
|
|
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'])
|
|
|
|
|
2013-12-03 16:51:46 +00:00
|
|
|
@requires_network()
|
2013-11-29 00:37:39 +00:00
|
|
|
def test_installed(self):
|
|
|
|
b_dir = os.path.join(self.tdir, 'b')
|
2013-12-22 17:39:07 +00:00
|
|
|
ret = buildout.installed(b_dir,
|
|
|
|
python=self.py_st,
|
|
|
|
onlyif='/bin/false')
|
2017-10-25 14:55:24 +00:00
|
|
|
self.assertEqual(ret['comment'], '\nonlyif condition is false')
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertEqual(ret['result'], True)
|
2013-11-29 00:37:39 +00:00
|
|
|
self.assertTrue('/b' in ret['name'])
|
|
|
|
b_dir = os.path.join(self.tdir, 'b')
|
2013-12-22 17:39:07 +00:00
|
|
|
ret = buildout.installed(b_dir,
|
|
|
|
python=self.py_st,
|
|
|
|
unless='/bin/true')
|
2017-10-25 14:55:24 +00:00
|
|
|
self.assertEqual(ret['comment'], '\nunless condition is true')
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertEqual(ret['result'], True)
|
2013-11-29 00:37:39 +00:00
|
|
|
self.assertTrue('/b' in ret['name'])
|
2013-12-22 17:39:07 +00:00
|
|
|
ret = buildout.installed(b_dir, python=self.py_st)
|
2013-12-03 22:54:38 +00:00
|
|
|
self.assertEqual(ret['result'], True)
|
2013-11-29 00:37:39 +00:00
|
|
|
self.assertTrue('OUTPUT:' in ret['comment'])
|
|
|
|
self.assertTrue('Log summary:' in ret['comment'])
|