mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
002aa88a97
Without allow_unicode=True, unicode characters are processed through the str representer and on Python 2 are dumped as a Unicode code point (i.e. a literal \u0414). This commit makes allow_unicode=True the default in our salt.utils.yamlloader.safe_dump() helper. It also adds a new salt.utils.yamlloader.dump() helper which wraps yaml.dump() and also makes allow_unicode=True the default. To make importing and using our custom yaml loader/dumper easier, a convenience module called salt.utils.yaml has been added, which does a wildcard import from both salt.utils.yamldumper and salt.utils.yamlloader. Refs to yaml.load/dump and yaml.safe_load/safe_dump have been updated to salt.utils.yaml, to ensure that unicode is handled properly.
141 lines
4.2 KiB
Python
141 lines
4.2 KiB
Python
# -*- coding: utf-8 -*-
|
|
'''
|
|
integration.loader.globals
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Test Salt's loader regarding globals that it should pack in
|
|
'''
|
|
# Import Python libs
|
|
from __future__ import absolute_import, print_function, unicode_literals
|
|
import inspect
|
|
|
|
# Import Salt Testing libs
|
|
from tests.support.case import ModuleCase
|
|
|
|
# Import salt libs
|
|
import salt.loader
|
|
import salt.utils.yaml
|
|
|
|
# Import 3rd-party libs
|
|
from salt.ext import six
|
|
|
|
|
|
class LoaderGlobalsTest(ModuleCase):
|
|
'''
|
|
Test all of the globals that the loader is responsible for adding to modules
|
|
|
|
This shouldn't be done here, but should rather be done per module type (in the cases where they are used)
|
|
so they can check ALL globals that they have (or should have) access to.
|
|
|
|
This is intended as a shorter term way of testing these so we don't break the loader
|
|
'''
|
|
def _verify_globals(self, mod_dict):
|
|
'''
|
|
Verify that the globals listed in the doc string (from the test) are in these modules
|
|
'''
|
|
# find the globals
|
|
global_vars = []
|
|
for val in six.itervalues(mod_dict):
|
|
# only find salty globals
|
|
if val.__module__.startswith('salt.loaded') and hasattr(val, '__globals__'):
|
|
global_vars.append(val.__globals__)
|
|
|
|
# if we couldn't find any, then we have no modules -- so something is broken
|
|
self.assertNotEqual(global_vars, [], msg='No modules were loaded.')
|
|
|
|
# get the names of the globals you should have
|
|
func_name = inspect.stack()[1][3]
|
|
names = next(six.itervalues(salt.utils.yaml.safe_load(getattr(self, func_name).__doc__)))
|
|
|
|
# Now, test each module!
|
|
for item in global_vars:
|
|
for name in names:
|
|
self.assertIn(name, list(item.keys()))
|
|
|
|
def test_auth(self):
|
|
'''
|
|
Test that auth mods have:
|
|
- __pillar__
|
|
- __grains__
|
|
- __salt__
|
|
- __context__
|
|
'''
|
|
self._verify_globals(salt.loader.auth(self.master_opts))
|
|
|
|
def test_runners(self):
|
|
'''
|
|
Test that runners have:
|
|
- __pillar__
|
|
- __salt__
|
|
- __opts__
|
|
- __grains__
|
|
- __context__
|
|
'''
|
|
self._verify_globals(salt.loader.runner(self.master_opts))
|
|
|
|
def test_returners(self):
|
|
'''
|
|
Test that returners have:
|
|
- __salt__
|
|
- __opts__
|
|
- __pillar__
|
|
- __grains__
|
|
- __context__
|
|
'''
|
|
self._verify_globals(salt.loader.returners(self.master_opts, {}))
|
|
|
|
def test_pillars(self):
|
|
'''
|
|
Test that pillars have:
|
|
- __salt__
|
|
- __opts__
|
|
- __pillar__
|
|
- __grains__
|
|
- __context__
|
|
'''
|
|
self._verify_globals(salt.loader.pillars(self.master_opts, {}))
|
|
|
|
def test_tops(self):
|
|
'''
|
|
Test that tops have: []
|
|
'''
|
|
self._verify_globals(salt.loader.tops(self.master_opts))
|
|
|
|
def test_outputters(self):
|
|
'''
|
|
Test that outputters have:
|
|
- __opts__
|
|
- __pillar__
|
|
- __grains__
|
|
- __context__
|
|
'''
|
|
self._verify_globals(salt.loader.outputters(self.master_opts))
|
|
|
|
def test_serializers(self):
|
|
'''
|
|
Test that serializers have: []
|
|
'''
|
|
self._verify_globals(salt.loader.serializers(self.master_opts))
|
|
|
|
def test_states(self):
|
|
'''
|
|
Test that states:
|
|
- __pillar__
|
|
- __salt__
|
|
- __opts__
|
|
- __grains__
|
|
- __context__
|
|
'''
|
|
self._verify_globals(salt.loader.states(self.master_opts, {}, {}, {}))
|
|
|
|
def test_renderers(self):
|
|
'''
|
|
Test that renderers have:
|
|
- __salt__ # Execution functions (i.e. __salt__['test.echo']('foo'))
|
|
- __grains__ # Grains (i.e. __grains__['os'])
|
|
- __pillar__ # Pillar data (i.e. __pillar__['foo'])
|
|
- __opts__ # Minion configuration options
|
|
- __context__ # Context dict shared amongst all modules of the same type
|
|
'''
|
|
self._verify_globals(salt.loader.render(self.master_opts, {}))
|