mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +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.
58 lines
1.4 KiB
Python
58 lines
1.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
tests.unit.utils.disk_cache_test
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Test the salt disk cache objects
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import os.path
|
|
import shutil
|
|
import tempfile
|
|
import time
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.unit import TestCase
|
|
|
|
# Import salt libs
|
|
import salt.utils.cache as cache
|
|
|
|
|
|
class CacheDiskTestCase(TestCase):
|
|
|
|
def test_everything(self):
|
|
'''
|
|
Make sure you can instantiate, add, update, remove, expire
|
|
'''
|
|
try:
|
|
tmpdir = tempfile.mkdtemp()
|
|
path = os.path.join(tmpdir, 'CacheDisk_test')
|
|
|
|
# test instantiation
|
|
cd = cache.CacheDisk(0.1, path)
|
|
self.assertIsInstance(cd, cache.CacheDisk)
|
|
|
|
# test to make sure it looks like a dict
|
|
self.assertNotIn('foo', cd)
|
|
cd['foo'] = 'bar'
|
|
self.assertIn('foo', cd)
|
|
self.assertEqual(cd['foo'], 'bar')
|
|
del cd['foo']
|
|
self.assertNotIn('foo', cd)
|
|
|
|
# test persistence
|
|
cd['foo'] = 'bar'
|
|
cd2 = cache.CacheDisk(0.1, path)
|
|
self.assertIn('foo', cd2)
|
|
self.assertEqual(cd2['foo'], 'bar')
|
|
|
|
# test ttl
|
|
time.sleep(0.2)
|
|
self.assertNotIn('foo', cd)
|
|
self.assertNotIn('foo', cd2)
|
|
|
|
finally:
|
|
shutil.rmtree(tmpdir, ignore_errors=True)
|