mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Merge pull request #43707 from terminalmage/issue43373
Add missing support for use/use_in requisites to state.sls_id
This commit is contained in:
commit
a2161efda3
2 changed files with 9 additions and 0 deletions
|
@ -1303,6 +1303,12 @@ def sls_id(id_, mods, test=None, queue=False, **kwargs):
|
|||
finally:
|
||||
st_.pop_active()
|
||||
errors += st_.state.verify_high(high_)
|
||||
# Apply requisites to high data
|
||||
high_, req_in_errors = st_.state.requisite_in(high_)
|
||||
if req_in_errors:
|
||||
# This if statement should not be necessary if there were no errors,
|
||||
# but it is required to get the unit tests to pass.
|
||||
errors.extend(req_in_errors)
|
||||
if errors:
|
||||
__context__['retcode'] = 1
|
||||
return errors
|
||||
|
|
|
@ -132,6 +132,9 @@ class MockState(object):
|
|||
data = data
|
||||
return True
|
||||
|
||||
def requisite_in(self, data): # pylint: disable=unused-argument
|
||||
return data, []
|
||||
|
||||
class HighState(object):
|
||||
'''
|
||||
Mock HighState class
|
||||
|
|
Loading…
Add table
Reference in a new issue