2015-02-21 05:57:54 +00:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
'''
|
|
|
|
|
:codeauthor: :email:`Alexander Pyatkin <asp@thexyz.net`
|
|
|
|
|
'''
|
|
|
|
|
# Import Python libs
|
2018-01-17 23:05:08 +00:00
|
|
|
from __future__ import absolute_import, print_function, unicode_literals
|
2015-02-21 05:57:54 +00:00
|
|
|
|
|
|
|
|
# Import Salt Testing libs
|
2017-04-03 16:04:09 +00:00
|
|
|
from tests.support.case import ModuleCase
|
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 destructiveTest
|
2017-04-02 16:09:47 +00:00
|
|
|
from tests.support.mixins import SaltReturnAssertsMixin
|
2015-02-21 05:57:54 +00:00
|
|
|
|
|
|
|
|
# Import salt libs
|
2017-12-22 19:54:53 +00:00
|
|
|
import salt.utils.json
|
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
|
2015-02-21 05:57:54 +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('bower') is None, 'bower not installed')
|
2017-04-03 16:04:09 +00:00
|
|
|
class BowerStateTest(ModuleCase, SaltReturnAssertsMixin):
|
2015-02-21 05:57:54 +00:00
|
|
|
|
|
|
|
|
@destructiveTest
|
|
|
|
|
def test_bower_installed_removed(self):
|
|
|
|
|
'''
|
|
|
|
|
Basic test to determine if Bower package was successfully installed and
|
|
|
|
|
removed.
|
|
|
|
|
'''
|
|
|
|
|
ret = self.run_state('file.directory', name='/salt_test_bower_1',
|
|
|
|
|
makedirs=True)
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('bower.installed', name='underscore',
|
|
|
|
|
dir='/salt_test_bower_1')
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('bower.removed', name='underscore',
|
|
|
|
|
dir='/salt_test_bower_1')
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('file.absent', name='/salt_test_bower_1')
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
|
|
|
|
|
@destructiveTest
|
|
|
|
|
def test_bower_installed_pkgs(self):
|
|
|
|
|
'''
|
|
|
|
|
Basic test to determine if Bower package successfully installs multiple
|
|
|
|
|
packages.
|
|
|
|
|
'''
|
|
|
|
|
ret = self.run_state('file.directory', name='/salt_test_bower_2',
|
|
|
|
|
makedirs=True)
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('bower.installed', name='test',
|
|
|
|
|
dir='/salt_test_bower_2',
|
|
|
|
|
pkgs=['numeral', 'underscore'])
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('file.absent', name='/salt_test_bower_2')
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
|
|
|
|
|
@destructiveTest
|
|
|
|
|
def test_bower_installed_from_file(self):
|
|
|
|
|
ret = self.run_state('file.directory', name='/salt_test_bower_3',
|
|
|
|
|
makedirs=True)
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
2017-12-22 19:54:53 +00:00
|
|
|
bower_json = salt.utils.json.dumps({
|
2015-02-21 05:57:54 +00:00
|
|
|
'name': 'salt_test_bower_3',
|
|
|
|
|
'dependencies': {
|
|
|
|
|
'numeral': '~1.5.3',
|
|
|
|
|
'underscore': '~1.7.0'
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
ret = self.run_state('file.managed',
|
|
|
|
|
name='/salt_test_bower_3/bower.json',
|
|
|
|
|
contents=bower_json)
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('bower.bootstrap', name='/salt_test_bower_3')
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
|
|
|
|
ret = self.run_state('file.absent', name='/salt_test_bower_3')
|
|
|
|
|
self.assertSaltTrueReturn(ret)
|
