From dbfd3b0f193bb61f57c4f55bfc435057045ffe51 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 11 Nov 2024 16:29:34 -0700
Subject: [PATCH] Updated testing

---
 .github/workflows/test-linux.yml       |  6 ++++--
 .github/workflows/test-macos.yml       |  6 ++++--
 tests/integration/test_installation.py | 28 ++++++++++++--------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index dcfddc6..3234048 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -61,10 +61,12 @@ jobs:
 
       - name: Bootstrap Salt
         run: |
+          # sed 1st - becomes space, 2nd - becomes dot
           echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
-          echo "bt parms ,$bt_parms,"
-          sh -x ./bootstrap-salt.sh "$bt_parms"
+          bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
+          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
+          sh -x ./bootstrap-salt.sh "$bt_parms2"
 
       - name: Test Bootstrap
         run: |
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 171bd22..4a7f2e3 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -53,10 +53,12 @@ jobs:
 
       - name: Bootstrap Salt
         run: |
+          # sed 1st - becomes space, 2nd - becomes dot
           echo "matrix instance ,${{ matrix.instance }},"
           bt_parms=$(echo "${{ matrix.instance }}" | sed 's/-/ /')
-          echo "bt parms ,$bt_parms,"
-          sudo sh -x ./bootstrap-salt.sh "$bt_parms"
+          bt_parms2=$(echo "$bt_parms" | sed 's/-/./')
+          echo "bt parms ,$bt_parms, bt_parms2 ,$bt_parms2,"
+          sh -x ./bootstrap-salt.sh "$bt_parms2"
 
       - name: Test Bootstrap
         run: |
diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py
index 4d7f409..7272401 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -39,22 +39,20 @@ def run_salt_call(cmd):
             log.error(f"failed to produce output result, '{result}'")
 
     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}'")
+        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"]
+    return json_data["local"]
 
 
 def test_ping(path):