From 27f6fb4d3c5c53556161c853394a20cfeb77c3e6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Mon, 2 Oct 2023 15:12:55 -0700 Subject: [PATCH] fixing failing tests --- salt/state.py | 3 +++ tests/pytests/unit/state/test_state_highstate.py | 1 + 2 files changed, 4 insertions(+) diff --git a/salt/state.py b/salt/state.py index a638f141660..5e2f772b170 100644 --- a/salt/state.py +++ b/salt/state.py @@ -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( diff --git a/tests/pytests/unit/state/test_state_highstate.py b/tests/pytests/unit/state/test_state_highstate.py index 5278c4a4b72..f90abc50491 100644 --- a/tests/pytests/unit/state/test_state_highstate.py +++ b/tests/pytests/unit/state/test_state_highstate.py @@ -323,6 +323,7 @@ def test_dont_extend_in_excluded_sls_file(highstate, state_tree_dir): ), ("__sls__", "test2"), ("__env__", "base"), + ("__sls_included_from__", ["test1"]), ] ), ),