cleanup

salt/client/ssh/state.py

@@ -60,7 +60,7 @@ class SSHState(salt.state.State):
         """
         The opts used during pillar rendering should contain the master
         opts in the root namespace. self.opts is the modified minion opts,
-        containing the original master opts in `__master_opts__`.
+        containing the original master opts in __master_opts__.
         """
         _opts = self.opts
         popts = {}

tests/pytests/integration/ssh/test_pillar_compilation.py

@@ -217,6 +217,8 @@ def test_gpg_pillar(salt_ssh_cli):
     assert "secrets" in ret.data
     assert "foo" in ret.data["secrets"]
     assert "BEGIN PGP MESSAGE" not in ret.data["secrets"]["foo"]
+    assert ret.data["secrets"]["foo"] == "supersecret"
+    assert "_errors" not in ret.data
 
 
 @pytest.mark.usefixtures("pillar_setup")
@@ -236,3 +238,4 @@ def test_saltutil_runner(salt_ssh_cli, salt_minion, salt_run_cli):
     assert ret.data["saltutil"]
     assert salt_minion.id in ret.data["saltutil"]
     assert ret.data["saltutil"][salt_minion.id] is True
+    assert "_errors" not in ret.data

tests/pytests/integration/ssh/test_state.py

@@ -795,7 +795,6 @@ class TestStatePillarOverrideTemplate:
             - source: salt://deepthought.txt.jinja
             - template: jinja
         """
-        # deepthought = "{{ {'the_meaning': pillar.get('the_meaning'), 'btw': pillar.get('btw')} | json }}"
         deepthought = r"""
         {{
           {