Fix the test_fileclient test

Author: twangboy

tests/pytests/integration/pillar/test_fileclient.py

@@ -4,21 +4,25 @@ def test_pillar_using_cp_module(salt_master, salt_minion, salt_cli, tmp_path):
       "*":
         - my_pillar
     """
-    my_pillar = """
-    {{% set file_content = salt.cp.get_file_str("{}") %}}
-    """.format(
-        str(tmp_path / "myfile.txt")
-    )
-    my_file = """
-    foobar
+    my_file = tmp_path / "my_file.txt"
+    my_file.write_text("foobar")
+    my_file_contents = my_file.read_text()
+    my_pillar = f"""
+    {{%- set something = salt['cp.get_file_str']("{str(my_file)}") %}}
+    file_content: {{{{ something }}}}
     """
-    (tmp_path / "myfile.txt").write_text(my_file)
     with salt_master.pillar_tree.base.temp_file("top.sls", pillar_top):
         with salt_master.pillar_tree.base.temp_file("my_pillar.sls", my_pillar):
-            with salt_master.pillar_tree.base.temp_file("my_pillar.sls", my_pillar):
-                ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
-                assert ret.returncode == 1
-                assert (
-                    ret.json["no_|-states_|-states_|-None"]["comment"]
-                    == "No states found for this minion"
-                )
+            ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
+            assert ret.returncode == 1
+            assert (
+                ret.json["no_|-states_|-states_|-None"]["comment"]
+                == "No states found for this minion"
+            )
+
+            pillar_ret = salt_cli.run(
+                "pillar.item", "file_content", minion_tgt=salt_minion.id
+            )
+            assert pillar_ret.returncode == 0
+
+            assert '"file_content": "foobar"' in pillar_ret.stdout

tests/pytests/integration/pillar/test_httpclient_in_pillar.py

@@ -11,19 +11,16 @@ def test_pillar_using_http_query(salt_master, salt_minion, salt_cli, tmp_path):
 
     with salt_master.pillar_tree.base.temp_file("top.sls", pillar_top):
         with salt_master.pillar_tree.base.temp_file("http_pillar_test.sls", my_pillar):
-            with salt_master.pillar_tree.base.temp_file(
-                "http_pillar_test.sls", my_pillar
-            ):
-                ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
-                assert ret.returncode == 1
-                assert (
-                    ret.data["no_|-states_|-states_|-None"]["comment"]
-                    == "No states found for this minion"
-                )
+            ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
+            assert ret.returncode == 1
+            assert (
+                ret.data["no_|-states_|-states_|-None"]["comment"]
+                == "No states found for this minion"
+            )
 
-                pillar_ret = salt_cli.run(
-                    "pillar.item", "http_query_test", minion_tgt=salt_minion.id
-                )
-                assert pillar_ret.returncode == 0
+            pillar_ret = salt_cli.run(
+                "pillar.item", "http_query_test", minion_tgt=salt_minion.id
+            )
+            assert pillar_ret.returncode == 0
 
-                assert '"http_query_test": 200' in pillar_ret.stdout
+            assert '"http_query_test": 200' in pillar_ret.stdout