mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +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.
79 lines
2.0 KiB
Python
79 lines
2.0 KiB
Python
# coding: utf-8
|
|
|
|
# Import Python Libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import 3rd-party libs
|
|
import tornado.testing
|
|
import tornado.gen
|
|
from tornado.testing import AsyncTestCase
|
|
|
|
import salt.utils.async as async
|
|
|
|
|
|
class HelperA(object):
|
|
def __init__(self, io_loop=None):
|
|
pass
|
|
|
|
@tornado.gen.coroutine
|
|
def sleep(self):
|
|
yield tornado.gen.sleep(0.5)
|
|
raise tornado.gen.Return(True)
|
|
|
|
|
|
class HelperB(object):
|
|
def __init__(self, a=None, io_loop=None):
|
|
if a is None:
|
|
a = async.SyncWrapper(HelperA)
|
|
self.a = a
|
|
|
|
@tornado.gen.coroutine
|
|
def sleep(self):
|
|
yield tornado.gen.sleep(0.5)
|
|
self.a.sleep()
|
|
raise tornado.gen.Return(False)
|
|
|
|
|
|
class TestSyncWrapper(AsyncTestCase):
|
|
@tornado.testing.gen_test
|
|
def test_helpers(self):
|
|
'''
|
|
Test that the helper classes do what we expect within a regular async env
|
|
'''
|
|
ha = HelperA()
|
|
ret = yield ha.sleep()
|
|
self.assertTrue(ret)
|
|
|
|
hb = HelperB()
|
|
ret = yield hb.sleep()
|
|
self.assertFalse(ret)
|
|
|
|
def test_basic_wrap(self):
|
|
'''
|
|
Test that we can wrap an async caller.
|
|
'''
|
|
sync = async.SyncWrapper(HelperA)
|
|
ret = sync.sleep()
|
|
self.assertTrue(ret)
|
|
|
|
def test_double(self):
|
|
'''
|
|
Test when the async wrapper object itself creates a wrap of another thing
|
|
|
|
This works fine since the second wrap is based on the first's IOLoop so we
|
|
don't have to worry about complex start/stop mechanics
|
|
'''
|
|
sync = async.SyncWrapper(HelperB)
|
|
ret = sync.sleep()
|
|
self.assertFalse(ret)
|
|
|
|
def test_double_sameloop(self):
|
|
'''
|
|
Test async wrappers initiated from the same IOLoop, to ensure that
|
|
we don't wire up both to the same IOLoop (since it causes MANY problems).
|
|
'''
|
|
a = async.SyncWrapper(HelperA)
|
|
sync = async.SyncWrapper(HelperB, (a,))
|
|
ret = sync.sleep()
|
|
self.assertFalse(ret)
|