mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +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.
59 lines
2.0 KiB
Python
59 lines
2.0 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
import tempfile
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
from tests.support.unit import skipIf
|
|
from tests.support.paths import TMP
|
|
|
|
# Import salt libs
|
|
import salt.utils.path
|
|
from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
|
|
|
|
|
|
@skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
|
|
class VirtualenvModuleTest(ModuleCase):
|
|
'''
|
|
Validate the virtualenv module
|
|
'''
|
|
def setUp(self):
|
|
super(VirtualenvModuleTest, self).setUp()
|
|
self.venv_test_dir = tempfile.mkdtemp(dir=TMP)
|
|
self.venv_dir = os.path.join(self.venv_test_dir, 'venv')
|
|
|
|
def test_create_defaults(self):
|
|
'''
|
|
virtualenv.managed
|
|
'''
|
|
self.run_function('virtualenv.create', [self.venv_dir])
|
|
pip_file = os.path.join(self.venv_dir, 'bin', 'pip')
|
|
self.assertTrue(os.path.exists(pip_file))
|
|
|
|
def test_site_packages(self):
|
|
pip_bin = os.path.join(self.venv_dir, 'bin', 'pip')
|
|
self.run_function(
|
|
'virtualenv.create', [self.venv_dir], system_site_packages=True
|
|
)
|
|
with_site = self.run_function('pip.freeze', bin_env=pip_bin)
|
|
self.run_function('file.remove', [self.venv_dir])
|
|
self.run_function('virtualenv.create', [self.venv_dir])
|
|
without_site = self.run_function('pip.freeze', bin_env=pip_bin)
|
|
self.assertFalse(with_site == without_site)
|
|
|
|
def test_clear(self):
|
|
pip_bin = os.path.join(self.venv_dir, 'bin', 'pip')
|
|
self.run_function('virtualenv.create', [self.venv_dir])
|
|
self.run_function('pip.install', [], pkgs='pep8', bin_env=pip_bin)
|
|
self.run_function('virtualenv.create', [self.venv_dir], clear=True)
|
|
packages = self.run_function(
|
|
'pip.list', prefix='pep8', bin_env=pip_bin
|
|
)
|
|
self.assertFalse('pep8' in packages)
|
|
|
|
def tearDown(self):
|
|
self.run_function('file.remove', [self.venv_test_dir])
|