From ba77751f992d59e653d712ece02b778be8deb7c0 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 11 Nov 2024 15:39:41 -0700
Subject: [PATCH] Adjusted test

---
 tests/integration/test_installation.py | 38 ++++++++++++++------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py
index acd9703..ada3ddb 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -3,7 +3,6 @@ import logging
 import os
 import platform
 import subprocess
-import tempfile
 
 import pytest
 
@@ -25,20 +24,12 @@ def run_salt_call(cmd):
     Runs salt call command and returns a dictionary
     Accepts cmd as a list
     """
-    tmpf = tempfile.NamedTemporaryFile(delete=False)
     json_data = {"local": {}}
-
-    try:
-        if platform.system() == "Windows":
-            cmdl = cmd
-        else:
-            cmdl = ["sudo"]
-            cmdl.extend(cmd)
-        cmdl.append("--out=json")
-        cmdl.append(f"--log-file={tmpf.name}")
-        result = subprocess.run(cmdl, capture_output=True, text=True)
+    if platform.system() == "Windows":
+        cmd.append("--out=json")
+        result = subprocess.run(cmd, capture_output=True, text=True)
         print(
-            f"DGM run_salt_call, cmdl '{cmdl}', result '{result}', stdout '{result.stdout}'",
+            f"DGM run_salt_call, cmd '{cmd}', result '{result}', stdout '{result.stdout}'",
             flush=True,
         )
         if 0 == result.returncode:
@@ -46,10 +37,23 @@ def run_salt_call(cmd):
         else:
             log.error(f"failed to produce output result, '{result}'")
 
-    finally:
-        tmpf.close()
-        os.unlink(tmpf.name)
-        return json_data["local"]
+    else:
+        try:
+            cmdl = ["sudo"]
+            cmdl.extend(cmd)
+            cmdl.append("--out=json")
+            result = subprocess.run(cmdl, capture_output=True, text=True)
+            print(
+                f"DGM run_salt_call, cmdl '{cmdl}', result '{result}', stdout '{result.stdout}'",
+                flush=True,
+            )
+            if 0 == result.returncode:
+                json_data = json.loads(result.stdout)
+            else:
+                log.error(f"failed to produce output result, '{result}'")
+
+        finally:
+            return json_data["local"]
 
 
 def test_ping(path):