mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
6504bb6b02
Conflicts: - salt/modules/pillar.py - salt/states/archive.py - tests/integration/states/archive.py
116 lines
3.6 KiB
Python
116 lines
3.6 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
|
|
# Import Salt Testing libs
|
|
from salttesting import skipIf, TestCase
|
|
from salttesting.helpers import ensure_in_syspath
|
|
from salttesting.mock import (
|
|
MagicMock,
|
|
patch,
|
|
NO_MOCK,
|
|
NO_MOCK_REASON
|
|
)
|
|
|
|
ensure_in_syspath('../../')
|
|
|
|
# Import Salt libs
|
|
import salt.ext.six as six
|
|
from salt.utils.odict import OrderedDict
|
|
from salt.modules import pillar as pillarmod
|
|
|
|
|
|
pillar_value_1 = dict(a=1, b='very secret')
|
|
|
|
|
|
class PillarModuleTestCase(TestCase):
|
|
|
|
def test_obfuscate_inner_recursion(self):
|
|
self.assertEqual(
|
|
pillarmod._obfuscate_inner(dict(a=[1, 2],
|
|
b=dict(pwd='secret', deeper=('a', 1)))),
|
|
dict(a=['<int>', '<int>'],
|
|
b=dict(pwd='<str>', deeper=('<str>', '<int>')))
|
|
)
|
|
|
|
def test_obfuscate_inner_more_types(self):
|
|
self.assertEqual(pillarmod._obfuscate_inner(OrderedDict([('key', 'value')])),
|
|
OrderedDict([('key', '<str>')]))
|
|
|
|
self.assertEqual(pillarmod._obfuscate_inner(set((1, 2))),
|
|
set(['<int>']))
|
|
|
|
self.assertEqual(pillarmod._obfuscate_inner((1, 2)),
|
|
('<int>', '<int>'))
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
@patch('salt.modules.pillar.items', MagicMock(return_value=pillar_value_1))
|
|
def test_obfuscate(self):
|
|
self.assertEqual(pillarmod.obfuscate(),
|
|
dict(a='<int>', b='<str>'))
|
|
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
@patch('salt.modules.pillar.items', MagicMock(return_value=pillar_value_1))
|
|
def test_ls(self):
|
|
if six.PY3:
|
|
self.assertCountEqual(pillarmod.ls(), ['a', 'b'])
|
|
else:
|
|
self.assertEqual(pillarmod.ls(), ['a', 'b'])
|
|
|
|
def test_pillar_get_default_merge(self):
|
|
pillarmod.__opts__ = {}
|
|
pillarmod.__pillar__ = {'key': 'value'}
|
|
default = {'default': 'plop'}
|
|
|
|
res = pillarmod.get(key='key', default=default)
|
|
self.assertEqual("value", res)
|
|
|
|
res = pillarmod.get(key='missing pillar', default=default)
|
|
self.assertEqual({'default': 'plop'}, res)
|
|
|
|
def test_pillar_get_default_merge_regression_38558(self):
|
|
"""Test for pillar.get(key=..., default=..., merge=True)
|
|
|
|
Do not update the ``default`` value when using ``merge=True``.
|
|
|
|
See: https://github.com/saltstack/salt/issues/38558
|
|
"""
|
|
|
|
pillarmod.__opts__ = {}
|
|
pillarmod.__pillar__ = {'l1': {'l2': {'l3': 42}}}
|
|
|
|
res = pillarmod.get(key='l1')
|
|
self.assertEqual({'l2': {'l3': 42}}, res)
|
|
|
|
default = {'l2': {'l3': 43}}
|
|
|
|
res = pillarmod.get(key='l1', default=default)
|
|
self.assertEqual({'l2': {'l3': 42}}, res)
|
|
self.assertEqual({'l2': {'l3': 43}}, default)
|
|
|
|
res = pillarmod.get(key='l1', default=default, merge=True)
|
|
self.assertEqual({'l2': {'l3': 42}}, res)
|
|
self.assertEqual({'l2': {'l3': 43}}, default)
|
|
|
|
def test_pillar_get_default_merge_regression_39062(self):
|
|
'''
|
|
Confirm that we do not raise an exception if default is None and
|
|
merge=True.
|
|
|
|
See https://github.com/saltstack/salt/issues/39062 for more info.
|
|
'''
|
|
pillarmod.__opts__ = {}
|
|
pillarmod.__pillar__ = {'foo': 'bar'}
|
|
|
|
self.assertEqual(
|
|
pillarmod.get(key='foo', default=None, merge=True),
|
|
'bar',
|
|
)
|
|
|
|
|
|
# gracinet: not sure this is really useful, but other test modules have this as well
|
|
if __name__ == '__main__':
|
|
from integration import run_tests
|
|
run_tests(PillarModuleTestCase, needs_daemon=False)
|