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.
187 lines
6.7 KiB
Python
187 lines
6.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Nicole Thomas <nicole@saltstack.com>`
|
|
'''
|
|
|
|
# Import Python Libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing Libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import destructiveTest, skip_if_not_root
|
|
|
|
# Import Salt Libs
|
|
import salt.utils.path
|
|
import salt.utils.platform
|
|
from salt.exceptions import CommandExecutionError
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
# Brew doesn't support local package installation - So, let's
|
|
# Grab some small packages available online for brew
|
|
ADD_PKG = 'algol68g'
|
|
DEL_PKG = 'acme'
|
|
|
|
|
|
@destructiveTest
|
|
@skip_if_not_root
|
|
@skipIf(not salt.utils.platform.is_darwin(), 'Test only applies to macOS')
|
|
@skipIf(not salt.utils.path.which('brew'), 'This test requires the brew binary')
|
|
class BrewModuleTest(ModuleCase):
|
|
'''
|
|
Integration tests for the brew module
|
|
'''
|
|
def test_brew_install(self):
|
|
'''
|
|
Tests the installation of packages
|
|
'''
|
|
try:
|
|
self.run_function('pkg.install', [ADD_PKG])
|
|
pkg_list = self.run_function('pkg.list_pkgs')
|
|
try:
|
|
self.assertIn(ADD_PKG, pkg_list)
|
|
except AssertionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
except CommandExecutionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
|
|
def test_remove(self):
|
|
'''
|
|
Tests the removal of packages
|
|
'''
|
|
try:
|
|
# Install a package to delete - If unsuccessful, skip the test
|
|
self.run_function('pkg.install', [DEL_PKG])
|
|
pkg_list = self.run_function('pkg.list_pkgs')
|
|
if DEL_PKG not in pkg_list:
|
|
self.run_function('pkg.install', [DEL_PKG])
|
|
self.skipTest('Failed to install a package to delete')
|
|
|
|
# Now remove the installed package
|
|
self.run_function('pkg.remove', [DEL_PKG])
|
|
del_list = self.run_function('pkg.list_pkgs')
|
|
try:
|
|
self.assertNotIn(DEL_PKG, del_list)
|
|
except AssertionError:
|
|
raise
|
|
except CommandExecutionError:
|
|
self.run_function('pkg.remove', [DEL_PKG])
|
|
raise
|
|
|
|
def test_version(self):
|
|
'''
|
|
Test pkg.version for mac. Installs a package and then checks we can get
|
|
a version for the installed package.
|
|
'''
|
|
try:
|
|
self.run_function('pkg.install', [ADD_PKG])
|
|
pkg_list = self.run_function('pkg.list_pkgs')
|
|
version = self.run_function('pkg.version', [ADD_PKG])
|
|
try:
|
|
self.assertTrue(version,
|
|
msg=('version: {0} is empty,\
|
|
or other issue is present'.format(version)))
|
|
self.assertIn(ADD_PKG, pkg_list,
|
|
msg=('package: {0} is not in\
|
|
the list of installed packages: {1}'
|
|
.format(ADD_PKG, pkg_list)))
|
|
#make sure the version is accurate and is listed in the pkg_list
|
|
self.assertIn(version, str(pkg_list[ADD_PKG]),
|
|
msg=('The {0} version: {1} is \
|
|
not listed in the pkg_list: {2}'
|
|
.format(ADD_PKG, version, pkg_list[ADD_PKG])))
|
|
except AssertionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
except CommandExecutionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
|
|
def test_latest_version(self):
|
|
'''
|
|
Test pkg.latest_version:
|
|
- get the latest version available
|
|
- install the package
|
|
- get the latest version available
|
|
- check that the latest version is empty after installing it
|
|
'''
|
|
try:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
uninstalled_latest = self.run_function('pkg.latest_version', [ADD_PKG])
|
|
|
|
self.run_function('pkg.install', [ADD_PKG])
|
|
installed_latest = self.run_function('pkg.latest_version', [ADD_PKG])
|
|
version = self.run_function('pkg.version', [ADD_PKG])
|
|
try:
|
|
self.assertTrue(isinstance(uninstalled_latest, six.string_types))
|
|
self.assertEqual(installed_latest, version)
|
|
except AssertionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
except CommandExecutionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
|
|
def test_refresh_db(self):
|
|
'''
|
|
Integration test to ensure pkg.refresh_db works with brew
|
|
'''
|
|
refresh_brew = self.run_function('pkg.refresh_db')
|
|
self.assertTrue(refresh_brew)
|
|
|
|
def test_list_upgrades(self):
|
|
'''
|
|
Test pkg.list_upgrades: data is in the form {'name1': 'version1',
|
|
'name2': 'version2', ... }
|
|
'''
|
|
try:
|
|
upgrades = self.run_function('pkg.list_upgrades')
|
|
try:
|
|
self.assertTrue(isinstance(upgrades, dict))
|
|
if len(upgrades):
|
|
for name in upgrades:
|
|
self.assertTrue(isinstance(name, six.string_types))
|
|
self.assertTrue(isinstance(upgrades[name], six.string_types))
|
|
except AssertionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
except CommandExecutionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
|
|
def test_info_installed(self):
|
|
'''
|
|
Test pkg.info_installed: info returned has certain fields used by
|
|
mac_brew.latest_version
|
|
'''
|
|
try:
|
|
self.run_function('pkg.install', [ADD_PKG])
|
|
info = self.run_function('pkg.info_installed', [ADD_PKG])
|
|
try:
|
|
self.assertTrue(ADD_PKG in info)
|
|
self.assertTrue('versions' in info[ADD_PKG])
|
|
self.assertTrue('revision' in info[ADD_PKG])
|
|
self.assertTrue('stable' in info[ADD_PKG]['versions'])
|
|
except AssertionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
except CommandExecutionError:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
raise
|
|
|
|
def tearDown(self):
|
|
'''
|
|
Clean up after tests
|
|
'''
|
|
pkg_list = self.run_function('pkg.list_pkgs')
|
|
|
|
# Remove any installed packages
|
|
if ADD_PKG in pkg_list:
|
|
self.run_function('pkg.remove', [ADD_PKG])
|
|
if DEL_PKG in pkg_list:
|
|
self.run_function('pkg.remove', [DEL_PKG])
|