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.
96 lines
2.6 KiB
Python
96 lines
2.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
tests.unit.utils.cache_test
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Test the salt cache objects
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import os
|
|
import time
|
|
import tempfile
|
|
import shutil
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import TestCase
|
|
|
|
# Import salt libs
|
|
import salt.config
|
|
import salt.loader
|
|
import salt.utils.cache as cache
|
|
|
|
|
|
class CacheDictTestCase(TestCase):
|
|
|
|
def test_sanity(self):
|
|
'''
|
|
Make sure you can instantiate etc.
|
|
'''
|
|
cd = cache.CacheDict(5)
|
|
self.assertIsInstance(cd, cache.CacheDict)
|
|
|
|
# do some tests to make sure it looks like a dict
|
|
self.assertNotIn('foo', cd)
|
|
cd['foo'] = 'bar'
|
|
self.assertEqual(cd['foo'], 'bar')
|
|
del cd['foo']
|
|
self.assertNotIn('foo', cd)
|
|
|
|
def test_ttl(self):
|
|
cd = cache.CacheDict(0.1)
|
|
cd['foo'] = 'bar'
|
|
self.assertIn('foo', cd)
|
|
self.assertEqual(cd['foo'], 'bar')
|
|
time.sleep(0.2)
|
|
self.assertNotIn('foo', cd)
|
|
|
|
# make sure that a get would get a regular old key error
|
|
self.assertRaises(KeyError, cd.__getitem__, 'foo')
|
|
|
|
|
|
class CacheContextTestCase(TestCase):
|
|
|
|
def setUp(self):
|
|
context_dir = os.path.join(tempfile.gettempdir(), 'context')
|
|
if os.path.exists(context_dir):
|
|
shutil.rmtree(os.path.join(tempfile.gettempdir(), 'context'))
|
|
|
|
def test_smoke_context(self):
|
|
'''
|
|
Smoke test the context cache
|
|
'''
|
|
if os.path.exists(os.path.join(tempfile.gettempdir(), 'context')):
|
|
self.skipTest('Context dir already exists')
|
|
else:
|
|
opts = salt.config.DEFAULT_MINION_OPTS
|
|
opts['cachedir'] = tempfile.gettempdir()
|
|
context_cache = cache.ContextCache(opts, 'cache_test')
|
|
|
|
context_cache.cache_context({'a': 'b'})
|
|
|
|
ret = context_cache.get_cache_context()
|
|
|
|
self.assertDictEqual({'a': 'b'}, ret)
|
|
|
|
def test_context_wrapper(self):
|
|
'''
|
|
Test to ensure that a module which decorates itself
|
|
with a context cache can store and retreive its contextual
|
|
data
|
|
'''
|
|
opts = salt.config.DEFAULT_MINION_OPTS
|
|
opts['cachedir'] = tempfile.gettempdir()
|
|
|
|
ll_ = salt.loader.LazyLoader(
|
|
[os.path.join(os.path.dirname(os.path.realpath(__file__)), 'cache_mods')],
|
|
tag='rawmodule',
|
|
virtual_enable=False,
|
|
opts=opts)
|
|
|
|
cache_test_func = ll_['cache_mod.test_context_module']
|
|
|
|
self.assertEqual(cache_test_func()['called'], 0)
|
|
self.assertEqual(cache_test_func()['called'], 1)
|