mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +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.
118 lines
3.5 KiB
Python
118 lines
3.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
:codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
|
|
|
|
|
|
tests.integration.modules.event
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
'''
|
|
|
|
# Import python libs
|
|
from __future__ import absolute_import
|
|
import time
|
|
import threading
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
|
|
# Import salt libs
|
|
import salt.utils.event as event
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext.six.moves.queue import Queue, Empty # pylint: disable=import-error,no-name-in-module
|
|
|
|
|
|
class EventModuleTest(ModuleCase):
|
|
def __test_event_fire_master(self):
|
|
events = Queue()
|
|
|
|
def get_event(events):
|
|
me = event.MasterEvent(self.master_opts['sock_dir'], listen=True)
|
|
events.put_nowait(
|
|
me.get_event(wait=10, tag='salttest', full=False)
|
|
)
|
|
|
|
threading.Thread(target=get_event, args=(events,)).start()
|
|
time.sleep(1) # Allow multiprocessing.Process to start
|
|
|
|
ret = self.run_function(
|
|
'event.fire_master',
|
|
['event.fire_master: just test it!!!!', 'salttest']
|
|
)
|
|
self.assertTrue(ret)
|
|
|
|
eventfired = events.get(block=True, timeout=10)
|
|
self.assertIsNotNone(eventfired)
|
|
self.assertIn(
|
|
'event.fire_master: just test it!!!!', eventfired['data']
|
|
)
|
|
|
|
ret = self.run_function(
|
|
'event.fire_master',
|
|
['event.fire_master: just test it!!!!', 'salttest-miss']
|
|
)
|
|
self.assertTrue(ret)
|
|
|
|
with self.assertRaises(Empty):
|
|
eventfired = events.get(block=True, timeout=10)
|
|
|
|
def __test_event_fire(self):
|
|
events = Queue()
|
|
|
|
def get_event(events):
|
|
me = event.MinionEvent(self.minion_opts, listen=True)
|
|
events.put_nowait(
|
|
me.get_event(wait=10, tag='salttest', full=False)
|
|
)
|
|
|
|
threading.Thread(target=get_event, args=(events,)).start()
|
|
time.sleep(1) # Allow multiprocessing.Process to start
|
|
|
|
ret = self.run_function(
|
|
'event.fire', ['event.fire: just test it!!!!', 'salttest']
|
|
)
|
|
self.assertTrue(ret)
|
|
|
|
eventfired = events.get(block=True, timeout=10)
|
|
self.assertIsNotNone(eventfired)
|
|
self.assertIn('event.fire: just test it!!!!', eventfired)
|
|
|
|
ret = self.run_function(
|
|
'event.fire', ['event.fire: just test it!!!!', 'salttest-miss']
|
|
)
|
|
self.assertTrue(ret)
|
|
|
|
with self.assertRaises(Empty):
|
|
eventfired = events.get(block=True, timeout=10)
|
|
|
|
def __test_event_fire_ipc_mode_tcp(self):
|
|
events = Queue()
|
|
|
|
def get_event(events):
|
|
me = event.MinionEvent(self.sub_minion_opts, listen=True)
|
|
events.put_nowait(
|
|
me.get_event(wait=10, tag='salttest', full=False)
|
|
)
|
|
|
|
threading.Thread(target=get_event, args=(events,)).start()
|
|
time.sleep(1) # Allow multiprocessing.Process to start
|
|
|
|
ret = self.run_function(
|
|
'event.fire', ['event.fire: just test it!!!!', 'salttest'],
|
|
minion_tgt='sub_minion'
|
|
)
|
|
self.assertTrue(ret)
|
|
|
|
eventfired = events.get(block=True, timeout=10)
|
|
self.assertIsNotNone(eventfired)
|
|
self.assertIn('event.fire: just test it!!!!', eventfired)
|
|
|
|
ret = self.run_function(
|
|
'event.fire', ['event.fire: just test it!!!!', 'salttest-miss'],
|
|
minion_tgt='sub_minion'
|
|
)
|
|
self.assertTrue(ret)
|
|
|
|
with self.assertRaises(Empty):
|
|
eventfired = events.get(block=True, timeout=10)
|