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 4

fixing failing tests

Browse source
This commit is contained in:
Gareth J. Greenaway 2023-10-02 15:12:55 -07:00
parent 2c6749e714
commit 27f6fb4d3c
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/state.py
View file

@ -4411,6 +4411,9 @@ class BaseHighState:
)
if nstate:
for item in nstate:
# Skip existing state keywords
if item.startswith("__"):
continue
if "__sls_included_from__" not in nstate[item]:
nstate[item]["__sls_included_from__"] = []
nstate[item]["__sls_included_from__"].append(

1
tests/pytests/unit/state/test_state_highstate.py
View file

@ -323,6 +323,7 @@ def test_dont_extend_in_excluded_sls_file(highstate, state_tree_dir):
),
("__sls__", "test2"),
("__env__", "base"),
("__sls_included_from__", ["test1"]),
]
),
),