salt/tests/integration/states/test_virtualenv.py
Erik Johnson 3184168365 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-08-08 13:33:43 -05:00

143 lines
5.1 KiB
Python

# -*- coding: utf-8 -*-
'''
:codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
tests.integration.states.virtualenv
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
'''
# Import Python libs
from __future__ import absolute_import
import os
import shutil
# 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
from tests.support.mixins import SaltReturnAssertsMixin
from tests.support.runtests import RUNTIME_VARS
# Import Salt libs
import salt.utils.files
import salt.utils.path
import salt.utils.platform
from salt.modules.virtualenv_mod import KNOWN_BINARY_NAMES
@skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
class VirtualenvTest(ModuleCase, SaltReturnAssertsMixin):
@destructiveTest
@skip_if_not_root
def test_issue_1959_virtualenv_runas(self):
user = 'issue-1959'
self.assertSaltTrueReturn(self.run_state('user.present', name=user))
uinfo = self.run_function('user.info', [user])
if salt.utils.platform.is_darwin():
# MacOS does not support createhome with user.present
self.assertSaltTrueReturn(self.run_state('file.directory', name=uinfo['home'], user=user, group=uinfo['groups'][0], dir_mode=755))
venv_dir = os.path.join(
RUNTIME_VARS.SYS_TMP_DIR, 'issue-1959-virtualenv-runas'
)
try:
ret = self.run_function(
'state.sls', mods='issue-1959-virtualenv-runas'
)
self.assertSaltTrueReturn(ret)
# Lets check proper ownership
statinfo = self.run_function('file.stats', [venv_dir])
self.assertEqual(statinfo['user'], uinfo['name'])
self.assertEqual(statinfo['uid'], uinfo['uid'])
finally:
if os.path.isdir(venv_dir):
shutil.rmtree(venv_dir)
self.assertSaltTrueReturn(self.run_state('user.absent', name=user, purge=True))
def test_issue_2594_non_invalidated_cache(self):
# Testing virtualenv directory
venv_path = os.path.join(RUNTIME_VARS.TMP, 'issue-2594-ve')
if os.path.exists(venv_path):
shutil.rmtree(venv_path)
# Our virtualenv requirements file
requirements_file_path = os.path.join(
RUNTIME_VARS.TMP_STATE_TREE, 'issue-2594-requirements.txt'
)
if os.path.exists(requirements_file_path):
os.unlink(requirements_file_path)
# Our state template
template = [
'{0}:'.format(venv_path),
' virtualenv.managed:',
' - system_site_packages: False',
' - clear: false',
' - requirements: salt://issue-2594-requirements.txt',
]
# Let's populate the requirements file, just pep-8 for now
with salt.utils.files.fopen(requirements_file_path, 'a') as fhw:
fhw.write('pep8==1.3.3\n')
# Let's run our state!!!
try:
ret = self.run_function(
'state.template_str', ['\n'.join(template)]
)
self.assertSaltTrueReturn(ret)
self.assertInSaltComment('Created new virtualenv', ret)
self.assertSaltStateChangesEqual(
ret, ['pep8==1.3.3'], keys=('packages', 'new')
)
except AssertionError:
# Always clean up the tests temp files
if os.path.exists(venv_path):
shutil.rmtree(venv_path)
if os.path.exists(requirements_file_path):
os.unlink(requirements_file_path)
raise
# Let's make sure, it really got installed
ret = self.run_function('pip.freeze', bin_env=venv_path)
self.assertIn('pep8==1.3.3', ret)
self.assertNotIn('zope.interface==4.0.1', ret)
# Now let's update the requirements file, which is now cached.
with salt.utils.files.fopen(requirements_file_path, 'w') as fhw:
fhw.write('zope.interface==4.0.1\n')
# Let's run our state!!!
try:
ret = self.run_function(
'state.template_str', ['\n'.join(template)]
)
self.assertSaltTrueReturn(ret)
self.assertInSaltComment('virtualenv exists', ret)
self.assertSaltStateChangesEqual(
ret, ['zope.interface==4.0.1'], keys=('packages', 'new')
)
except AssertionError:
# Always clean up the tests temp files
if os.path.exists(venv_path):
shutil.rmtree(venv_path)
if os.path.exists(requirements_file_path):
os.unlink(requirements_file_path)
raise
# Let's make sure, it really got installed
ret = self.run_function('pip.freeze', bin_env=venv_path)
self.assertIn('pep8==1.3.3', ret)
self.assertIn('zope.interface==4.0.1', ret)
# If we reached this point no assertion failed, so, cleanup!
if os.path.exists(venv_path):
shutil.rmtree(venv_path)
if os.path.exists(requirements_file_path):
os.unlink(requirements_file_path)