salt/tests/unit/modules/test_environ.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

130 lines
4.4 KiB
Python

# -*- coding: utf-8 -*-
'''
:codeauthor: :email:`Rupesh Tare <rupesht@saltstack.com>`
'''
# Import Python libs
from __future__ import absolute_import
import os
# Import Salt Testing Libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import TestCase, skipIf
from tests.support.mock import (
MagicMock,
patch,
NO_MOCK,
NO_MOCK_REASON
)
# Import Salt Libs
import salt.modules.environ as environ
@skipIf(NO_MOCK, NO_MOCK_REASON)
class EnvironTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.environ
'''
def setup_loader_modules(self):
return {environ: {}}
def test_setval(self):
'''
Test for set a single salt process environment variable. Returns True
on success.
'''
mock = MagicMock(return_value=None)
with patch.dict(os.environ, {}):
self.assertEqual(environ.setval('key', False, True), None)
mock = MagicMock(side_effect=Exception())
with patch.dict(os.environ, {}):
self.assertFalse(environ.setval('key', False, True))
mock_environ = {}
with patch.dict(os.environ, mock_environ):
self.assertEqual(environ.setval('key', False), '')
with patch.dict(os.environ, mock_environ):
self.assertFalse(environ.setval('key', True))
def test_set_val_permanent(self):
with patch.dict(os.environ, {}), \
patch.dict(environ.__salt__, {'reg.set_value': MagicMock(),
'reg.delete_value': MagicMock()}), \
patch('salt.utils.platform.is_windows', MagicMock(return_value=True)):
environ.setval('key', 'Test', permanent=True)
environ.__salt__['reg.set_value'].assert_called_with('HKCU', 'Environment', 'key', 'Test')
environ.setval('key', False, false_unsets=True, permanent=True)
environ.__salt__['reg.set_value'].asset_not_called()
environ.__salt__['reg.delete_value'].assert_called_with('HKCU', 'Environment', 'key')
key = r'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
environ.setval('key', 'Test', permanent='HKLM')
environ.__salt__['reg.set_value'].assert_called_with('HKLM', key, 'key', 'Test')
def test_setenv(self):
'''
Set multiple salt process environment variables from a dict.
Returns a dict.
'''
mock_environ = {'key': 'value'}
with patch.dict(os.environ, mock_environ):
self.assertFalse(environ.setenv('environ'))
with patch.dict(os.environ, mock_environ):
self.assertFalse(environ.setenv({'A': True},
False,
True,
False))
with patch.dict(os.environ, mock_environ):
mock_setval = MagicMock(return_value=None)
with patch.object(environ, 'setval', mock_setval):
self.assertEqual(environ.setenv({}, False, True, False)['key'],
None)
def test_get(self):
'''
Get a single salt process environment variable.
'''
self.assertFalse(environ.get(True))
self.assertEqual(environ.get('key'), '')
def test_has_value(self):
'''
Determine whether the key exists in the current salt process
environment dictionary. Optionally compare the current value
of the environment against the supplied value string.
'''
mock_environ = {}
with patch.dict(os.environ, mock_environ):
self.assertFalse(environ.has_value(True))
os.environ['salty'] = 'yes'
self.assertTrue(environ.has_value('salty', 'yes'))
os.environ['too_salty'] = 'no'
self.assertFalse(environ.has_value('too_salty', 'yes'))
self.assertFalse(environ.has_value('key', 'value'))
os.environ['key'] = 'value'
self.assertTrue(environ.has_value('key'))
def test_item(self):
'''
Get one or more salt process environment variables.
Returns a dict.
'''
self.assertEqual(environ.item(None), {})
def test_items(self):
'''
Return a dict of the entire environment set for the salt process
'''
self.assertNotEqual(list(environ.items()), [])