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.
81 lines
2.9 KiB
Python
81 lines
2.9 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
tests for pkgrepo states
|
|
'''
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.mixins import SaltReturnAssertsMixin
|
|
from tests.support.unit import skipIf
|
|
from tests.support.helpers import (
|
|
destructiveTest,
|
|
requires_system_grains
|
|
)
|
|
|
|
# Import Salt libs
|
|
import salt.utils.platform
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
class PkgrepoTest(ModuleCase, SaltReturnAssertsMixin):
|
|
'''
|
|
pkgrepo state tests
|
|
'''
|
|
@destructiveTest
|
|
@skipIf(salt.utils.platform.is_windows(), 'minion is windows')
|
|
@requires_system_grains
|
|
def test_pkgrepo_01_managed(self, grains):
|
|
'''
|
|
This is a destructive test as it adds a repository.
|
|
'''
|
|
os_grain = self.run_function('grains.item', ['os'])['os']
|
|
os_release_info = tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info'])
|
|
if os_grain == 'Ubuntu' and os_release_info >= (15, 10):
|
|
self.skipTest(
|
|
'The PPA used for this test does not exist for Ubuntu Wily'
|
|
' (15.10) and later.'
|
|
)
|
|
|
|
if grains['os_family'] == 'Debian':
|
|
try:
|
|
from aptsources import sourceslist
|
|
except ImportError:
|
|
self.skipTest(
|
|
'aptsources.sourceslist python module not found'
|
|
)
|
|
ret = self.run_function('state.sls', mods='pkgrepo.managed', timeout=120)
|
|
# If the below assert fails then no states were run, and the SLS in
|
|
# tests/integration/files/file/base/pkgrepo/managed.sls needs to be
|
|
# corrected.
|
|
self.assertReturnNonEmptySaltType(ret)
|
|
for state_id, state_result in six.iteritems(ret):
|
|
self.assertSaltTrueReturn(dict([(state_id, state_result)]))
|
|
|
|
@destructiveTest
|
|
@skipIf(salt.utils.platform.is_windows(), 'minion is windows')
|
|
def test_pkgrepo_02_absent(self):
|
|
'''
|
|
This is a destructive test as it removes the repository added in the
|
|
above test.
|
|
'''
|
|
os_grain = self.run_function('grains.item', ['os'])['os']
|
|
os_release_info = tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info'])
|
|
if os_grain == 'Ubuntu' and os_release_info >= (15, 10):
|
|
self.skipTest(
|
|
'The PPA used for this test does not exist for Ubuntu Wily'
|
|
' (15.10) and later.'
|
|
)
|
|
|
|
ret = self.run_function('state.sls', mods='pkgrepo.absent', timeout=120)
|
|
# If the below assert fails then no states were run, and the SLS in
|
|
# tests/integration/files/file/base/pkgrepo/absent.sls needs to be
|
|
# corrected.
|
|
self.assertReturnNonEmptySaltType(ret)
|
|
for state_id, state_result in six.iteritems(ret):
|
|
self.assertSaltTrueReturn(dict([(state_id, state_result)]))
|