saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move old unit tests to pytest

Browse source
This commit is contained in:
nicholasmhughes 2022-02-01 10:45:09 -05:00 • committed by Megan Wilhite
parent 6b9b75989c
commit 6ad12a4b54
2 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tests/pytests/unit/pillar/test_pillar.py
View file

@ -45,6 +45,47 @@ def test_pillar_get_tops_should_not_error_when_merging_strategy_is_none_and_no_p
assert not errors
def test_dynamic_pillarenv():
opts = {
"optimization_order": [0, 1, 2],
"renderer": "json",
"renderer_blacklist": [],
"renderer_whitelist": [],
"state_top": "",
"pillar_roots": {
"__env__": ["/srv/pillar/__env__"],
"base": ["/srv/pillar/base"],
"test": ["/srv/pillar/__env__"],
},
"file_roots": {"base": ["/srv/salt/base"], "__env__": ["/srv/salt/__env__"]},
"extension_modules": "",
}
pillar = salt.pillar.Pillar(opts, {}, "mocked-minion", "base", pillarenv="dev")
assert pillar.opts["pillar_roots"] == {
"base": ["/srv/pillar/base"],
"dev": ["/srv/pillar/dev"],
"test": ["/srv/pillar/__env__"],
}
def test_ignored_dynamic_pillarenv():
opts = {
"optimization_order": [0, 1, 2],
"renderer": "json",
"renderer_blacklist": [],
"renderer_whitelist": [],
"state_top": "",
"pillar_roots": {
"__env__": ["/srv/pillar/__env__"],
"base": ["/srv/pillar/base"],
},
"file_roots": {"base": ["/srv/salt/base"], "dev": ["/svr/salt/dev"]},
"extension_modules": "",
}
pillar = salt.pillar.Pillar(opts, {}, "mocked-minion", "base", pillarenv="base")
assert pillar.opts["pillar_roots"] == {"base": ["/srv/pillar/base"]}
@pytest.mark.parametrize(
"env",
("base", "something-else", "cool_path_123", "__env__"),

37
tests/unit/test_pillar.py
View file

@ -378,43 +378,6 @@ class PillarTestCase(TestCase):
finally:
shutil.rmtree(tempdir, ignore_errors=True)
def test_dynamic_pillarenv(self):
opts = {
"optimization_order": [0, 1, 2],
"renderer": "json",
"renderer_blacklist": [],
"renderer_whitelist": [],
"state_top": "",
"pillar_roots": {
"__env__": ["/srv/pillar/__env__"],
"base": ["/srv/pillar/base"],
},
"file_roots": {"base": ["/srv/salt/base"], "dev": ["/svr/salt/dev"]},
"extension_modules": "",
}
pillar = salt.pillar.Pillar(opts, {}, "mocked-minion", "base", pillarenv="dev")
self.assertEqual(
pillar.opts["pillar_roots"],
{"base": ["/srv/pillar/base"], "dev": ["/srv/pillar/__env__"]},
)
def test_ignored_dynamic_pillarenv(self):
opts = {
"optimization_order": [0, 1, 2],
"renderer": "json",
"renderer_blacklist": [],
"renderer_whitelist": [],
"state_top": "",
"pillar_roots": {
"__env__": ["/srv/pillar/__env__"],
"base": ["/srv/pillar/base"],
},
"file_roots": {"base": ["/srv/salt/base"], "dev": ["/svr/salt/dev"]},
"extension_modules": "",
}
pillar = salt.pillar.Pillar(opts, {}, "mocked-minion", "base", pillarenv="base")
self.assertEqual(pillar.opts["pillar_roots"], {"base": ["/srv/pillar/base"]})
@patch("salt.fileclient.Client.list_states")
def test_malformed_pillar_sls(self, mock_list_states):
with patch("salt.pillar.compile_template") as compile_template: