From 1f885ee0916f4068d9a075e50d1a8b1835446034 Mon Sep 17 00:00:00 2001
From: David Murphy <damurphy@vmware.com>
Date: Mon, 11 Nov 2024 14:28:28 -0700
Subject: [PATCH] Debug tests output

---
 .github/workflows/test-linux.yml       | 4 ----
 bootstrap-salt.sh                      | 4 +++-
 tests/integration/test_installation.py | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index f3ba7af..dcfddc6 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -51,10 +51,6 @@ jobs:
           echo "DGM pip test for distro-slug ${{ inputs.distro-slug }}"
           echo "DGM doing break-system-packages for distro-slug ${{ inputs.distro-slug }}"
           python3 -m pip install --break-system-packages -r tests/requirements.txt
-          else
-            echo "DGM plain pip for distro-slug ${{ inputs.distro-slug }}"
-            python3 -m pip install -r tests/requirements.txt
-          fi
 
       - name: Install Python Dependencies without pip breakage
         if: ${{ ( inputs.distro-slug != 'debian-11' ) && ( inputs.distro-slug != 'debian-12' ) && ( inputs.distro-slug != 'debian-13' ) && ( inputs.distro-slug != 'ubuntu-2404' ) }}
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 9028f7b..ab94e5f 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -634,7 +634,9 @@ if [ "$ITYPE" = "latest" ] || [ "$ITYPE" = "default" ]; then
     ONEDIR_REV="latest"
     _ONEDIR_REV="latest"
     ITYPE="onedir"
-    shift
+    if [ "$#" -gt 0 ];then
+        shift
+    fi
     echodebug "using ITYPE onedir for input 'latest' or 'default', cmd args left ,$#,"
 
 # If doing a git install, check what branch/tag/sha will be checked out
diff --git a/tests/integration/test_installation.py b/tests/integration/test_installation.py
index 84363c5..9a37498 100644
--- a/tests/integration/test_installation.py
+++ b/tests/integration/test_installation.py
@@ -26,6 +26,10 @@ def run_salt_call(cmd):
     """
     cmd.append("--out=json")
     result = subprocess.run(cmd, capture_output=True, text=True)
+    print(
+        f"DGM run_salt_call, cmd '{cmd}', result '{result}', stdout '{result.stdout}'",
+        flush=True,
+    )
     json_data = json.loads(result.stdout)
     return json_data["local"]