valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
f3cb8b73d7
salt/tests/integration/modules/test_event.py

118 lines
3.5 KiB
Python
Raw Normal View History

Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
# -*- coding: utf-8 -*-
'''
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
2012-12-11 10:23:37 +00:00
:codeauthor: :email:`Pedro Algarvio (pedro@algarvio.me)`
Don't include authorship in generated documentation, the Sphinx way.
2013-09-16 16:24:00 +00:00
tests.integration.modules.event
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
'''
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
2012-12-11 10:23:37 +00:00
# Import python libs
Add `from __future__ import absolute_import`
2014-11-21 19:05:13 +00:00
from __future__ import absolute_import
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
import time
import threading
Updated `integration.modules.event` test suite to use `salttesting.helpers.ensure_in_syspath()`
2013-06-27 11:02:41 +00:00
# Import Salt Testing libs
Import from the original modules not `tests.integration`
2017-04-03 16:04:09 +00:00
from tests.support.case import ModuleCase
Updated `integration.modules.event` test suite to use `salttesting.helpers.ensure_in_syspath()`
2013-06-27 11:02:41 +00:00
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
2012-12-11 10:23:37 +00:00
# Import salt libs
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-07-25 01:47:15 +00:00
import salt.utils.event as event
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
Py3 compatibility fixes
2014-11-22 11:07:45 +00:00
# Import 3rd-party libs
from salt.ext.six.moves.queue import Queue, Empty # pylint: disable=import-error,no-name-in-module
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
2012-12-11 10:23:37 +00:00
Import from the original modules not `tests.integration`
2017-04-03 16:04:09 +00:00
class EventModuleTest(ModuleCase):
stub out event fireing test until we can acertain what is wrong The events are getting cleanly fired, but the test is failing....
2013-03-11 23:09:56 +00:00
def __test_event_fire_master(self):
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
events = Queue()
def get_event(events):
Subscribe event to bus is optional now Once subscribed to publisher SUB socket gets collecting all incoming messages that is unwanted behavior for fire-only events. Fixed by using listen=<True|False> constructor argument.
2015-07-28 15:20:45 +00:00
me = event.MasterEvent(self.master_opts['sock_dir'], listen=True)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
events.put_nowait(
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
me.get_event(wait=10, tag='salttest', full=False)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
)
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)
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
eventfired = events.get(block=True, timeout=10)
Add None checks for eventfired in event.py
2013-02-08 00:51:08 +00:00
self.assertIsNotNone(eventfired)
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
2012-12-11 10:23:37 +00:00
self.assertIn(
'event.fire_master: just test it!!!!', eventfired['data']
)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
ret = self.run_function(
'event.fire_master',
['event.fire_master: just test it!!!!', 'salttest-miss']
)
self.assertTrue(ret)
with self.assertRaises(Empty):
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
eventfired = events.get(block=True, timeout=10)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
Stub out unreliable event test until it can be stabalized
2013-02-08 18:07:40 +00:00
def __test_event_fire(self):
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
events = Queue()
def get_event(events):
Subscribe event to bus is optional now Once subscribed to publisher SUB socket gets collecting all incoming messages that is unwanted behavior for fire-only events. Fixed by using listen=<True|False> constructor argument.
2015-07-28 15:20:45 +00:00
me = event.MinionEvent(self.minion_opts, listen=True)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
events.put_nowait(
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
me.get_event(wait=10, tag='salttest', full=False)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
)
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)
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
eventfired = events.get(block=True, timeout=10)
Add None checks for eventfired in event.py
2013-02-08 00:51:08 +00:00
self.assertIsNotNone(eventfired)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
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):
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
eventfired = events.get(block=True, timeout=10)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
stub out another event test that needs refinement
2013-02-08 20:14:45 +00:00
def __test_event_fire_ipc_mode_tcp(self):
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
events = Queue()
def get_event(events):
Subscribe event to bus is optional now Once subscribed to publisher SUB socket gets collecting all incoming messages that is unwanted behavior for fire-only events. Fixed by using listen=<True|False> constructor argument.
2015-07-28 15:20:45 +00:00
me = event.MinionEvent(self.sub_minion_opts, listen=True)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
events.put_nowait(
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
me.get_event(wait=10, tag='salttest', full=False)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
)
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)
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
eventfired = events.get(block=True, timeout=10)
Add None checks for eventfired in event.py
2013-02-08 00:51:08 +00:00
self.assertIsNotNone(eventfired)
Add tests for saltstack/salt#1900 * Test both master and minion events firing * Allow targeting the minions in `tests.integration.ModuleCase.run_function()` * The above item allows to also test events firing using `tcp` as `ipc_mode` which is being used by the tests `sub_minion`
2012-09-01 06:29:06 +00:00
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):
Try not to fail on travis-ci under python 2.6 * Raised max open files by 1024 since running in a vagrant machine 2048 was not enough, though, I think travis-ci defaults to a higher value. * Wait a bit longer on the events testing. * Separated the initial minions connected and minions synced into two different events and functions. Also corrected the `if` expected value when a timeout occurs.
2012-11-06 16:02:36 +00:00
eventfired = events.get(block=True, timeout=10)
Reference in New Issue Copy Permalink