pre-commit

This commit is contained in:
Joe Eacott 2021-04-01 13:24:51 -06:00 committed by Megan Wilhite
parent 954ccb4390
commit be0715b017
3 changed files with 3 additions and 0 deletions

View file

@ -2223,6 +2223,7 @@ def mminion_config(path, overrides, ignore_config_errors=True):
opts = minion_config(path, ignore_config_errors=ignore_config_errors, role="master")
opts.update(overrides)
apply_sdb(opts)
_validate_opts(opts)
opts["grains"] = salt.loader.grains(opts)
opts["pillar"] = {}

View file

@ -975,6 +975,7 @@ class MasterMinion:
self.whitelist = whitelist
self.mk_returners = returners
self.mk_states = states
self.mk_rend = rend
self.mk_matcher = matcher
self.gen_modules(initial_load=True)

View file

@ -1895,6 +1895,7 @@ class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
) as validate_opts_mock:
config = salt.config.minion_config(fpath, role="master")
apply_sdb_mock.assert_not_called()
validate_opts_mock.assert_not_called()
self.assertEqual(config["__role"], "master")