Clean up tests

twangboy · dwoz · commit ae7f1bed829b · 2025-05-16T17:58:16.000-07:00
diff --git a/tests/pytests/integration/cli/conftest.py b/tests/pytests/integration/cli/conftest.py
@@ -2,7 +2,6 @@
 
 
 @pytest.fixture(scope="package")
-@pytest.mark.core_test
 def salt_eauth_account(salt_eauth_account_factory):
     with salt_eauth_account_factory as account:
         yield account
diff --git a/tests/pytests/integration/pillar/test_fileclient.py b/tests/pytests/integration/pillar/test_fileclient.py
@@ -6,13 +6,14 @@ def test_pillar_using_cp_module(salt_master, salt_minion, salt_cli, tmp_path):
     """
     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 }}}}
     """
     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):
+
+            # We may need this for the following pillar.item to work
             ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
             assert ret.returncode == 1
             assert (
@@ -24,5 +25,4 @@ def test_pillar_using_cp_module(salt_master, salt_minion, salt_cli, tmp_path):
                 "pillar.item", "file_content", minion_tgt=salt_minion.id
             )
             assert pillar_ret.returncode == 0
-
             assert '"file_content": "foobar"' in pillar_ret.stdout
diff --git a/tests/pytests/integration/pillar/test_httpclient_in_pillar.py b/tests/pytests/integration/pillar/test_httpclient_in_pillar.py
@@ -9,25 +9,19 @@ def test_pillar_using_http_query(salt_master, salt_minion, salt_cli):
     http_query_test: {{ something }}
     """
 
-    with salt_master.pillar_tree.base.temp_file(
-        "top.sls",
-        pillar_top,
-    ) as p_top:
-        with salt_master.pillar_tree.base.temp_file(
-            "http_pillar_test.sls", my_pillar
-        ) as p_data:
-            top_content = p_top.read_text()
-            pillar_content = p_data.read_text()
+    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):
+
+            # We may need this for the following pillar.item to work
             ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
             assert ret.returncode == 1
             assert (
-                ret.data["no_|-states_|-states_|-None"]["comment"]
+                ret.json["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
-
             assert '"http_query_test": 200' in pillar_ret.stdout
