mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
fixes saltstack/salt#62523 saltcheck doesnt work with pyobjects renderer
This commit is contained in:
parent
cdd1269768
commit
95e011d25d
1 changed files with 11 additions and 6 deletions
|
@ -319,7 +319,11 @@ from salt.utils.odict import OrderedDict
|
|||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
global_scheck = None
|
||||
try:
|
||||
__context__
|
||||
except NameError:
|
||||
__context__ = {}
|
||||
__context__["global_scheck"] = None
|
||||
|
||||
__virtualname__ = "saltcheck"
|
||||
|
||||
|
@ -457,8 +461,7 @@ def run_state_tests(state, saltenv=None, check_all=False, only_fails=False):
|
|||
saltenv = "base"
|
||||
|
||||
# Use global scheck variable for reuse in each multiprocess
|
||||
global global_scheck
|
||||
global_scheck = SaltCheck(saltenv)
|
||||
__context__["global_scheck"] = SaltCheck(saltenv)
|
||||
|
||||
parallel = __salt__["config.get"]("saltcheck_parallel")
|
||||
num_proc = __salt__["config.get"]("saltcheck_processes")
|
||||
|
@ -508,7 +511,7 @@ def run_state_tests(state, saltenv=None, check_all=False, only_fails=False):
|
|||
results_dict[key] = value
|
||||
else:
|
||||
for key, value in stl.test_dict.items():
|
||||
result = global_scheck.run_test(value)
|
||||
result = __context__["global_scheck"].run_test(value)
|
||||
results_dict[key] = result
|
||||
|
||||
# If passed a duplicate state, don't overwrite with empty res
|
||||
|
@ -522,7 +525,7 @@ def parallel_scheck(data):
|
|||
key = data[0]
|
||||
value = data[1]
|
||||
results = {}
|
||||
results[key] = global_scheck.run_test(value)
|
||||
results[key] = __context__["global_scheck"].run_test(value)
|
||||
return results
|
||||
|
||||
|
||||
|
@ -620,7 +623,9 @@ def _render_file(file_path):
|
|||
call the salt utility to render a file
|
||||
"""
|
||||
# salt-call slsutil.renderer /srv/salt/jinjatest/saltcheck-tests/test1.tst
|
||||
rendered = __salt__["slsutil.renderer"](file_path, saltenv=global_scheck.saltenv)
|
||||
rendered = __salt__["slsutil.renderer"](
|
||||
file_path, saltenv=__context__["global_scheck"].saltenv
|
||||
)
|
||||
log.info("rendered: %s", rendered)
|
||||
return rendered
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue