lint/fixes

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 1d651c2f2035355aa3f66020cf5efc8741265968..867acc6b565ce87bb7cf5728e66695e1a4ba7f68 100644 (file)
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -44,7 +44,7 @@ jobs:
         run: make
 
       - name: Test Installer
-        run: bash ./tests/test-install-logic.sh
+        run: bash ./tests/installer-test-logic.sh
 
       - name: Install [make install]
         run: sudo make install
@@ -81,7 +81,7 @@ jobs:
         run: make
 
       - name: Test Installer
-        run: bash ./tests/test-install-logic.sh
+        run: bash ./tests/installer-test-logic.sh
 
       - name: Install [make install]
         run: make install # container runs as sudo

diff --git a/Makefile b/Makefile
index 6349c403350307b11af8870a5ac7cf3d9c332317..089c93d4c93806a862878850bdcaefed2aa1a53c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ test/installer:     ##H Test installer logic
                     --include-pattern=install.sh \
                     --exclude-path=$(PWD)/.git,$(PWD)/tests \
                     $(COV_INSTALL) \
-                    "$$test_script" 2>&1 | tee -a .tmp/kcov.log; \
+                    "$$test_script" 2>&1 | (mkdir -p .tmp; tee -a .tmp/kcov.log); \
             else \
                 bash "$$test_script" 2>&1 | tee -a .tmp/kcov.log; \
             fi; \
@@ -212,7 +212,7 @@ install/user:       ##H make install prefix=~/.local
 
 .PHONY: check/install
 check/install: ##H Verify installation works
-       bash ./tests/verify-system-install.sh
+       bash ./tests/installer-test-verify.sh
 
 
 .PHONY: uninstall/, uninstall

diff --git a/tests/installer-test-completions.sh b/tests/installer-test-completions.sh
index 0aa9466ea7e0d9b90668bb2a224856fc38228aab..efdf9016b54a1b0cd60d50a421488a2e05e71bd8 100644 (file)
--- a/tests/installer-test-completions.sh
+++ b/tests/installer-test-completions.sh
@@ -23,7 +23,7 @@ COMP_CWORD=0
 COMPREPLY=()
 
 # --- Mock git ---
-# shellcheck disable=SC2329
+# shellcheck disable=SC2329,SC2317
 git() {
        if [[ $1 == "remote" ]]; then
                echo "origin"

diff --git a/tests/system-test-clean-repack.sh b/tests/system-test-clean-repack.sh
index d3f1fa20ece69269714bd19ad4794fa3266b8431..acc18530217c8b8eef521352d862931006c5ea96 100755 (executable)
--- a/tests/system-test-clean-repack.sh
+++ b/tests/system-test-clean-repack.sh
@@ -139,9 +139,10 @@ echo "Running clean --repack --force..."
 git-remote-gcrypt clean --repack --force origin
 
 # Verify garbage removal from backend
-cd "$TEST_DIR/raw_backend"
-git fetch origin master
-git reset --hard origin/master
+cd "$TEST_DIR"
+rm -rf raw_backend_verify
+git clone "$REMOTE_DIR" raw_backend_verify
+cd raw_backend_verify
 
 if [ -f ".garbage (file)" ]; then
        echo "Failure: .garbage (file) still exists in backend!"
@@ -151,16 +152,8 @@ else
 fi
 
 # Verify result
-# Clone backend again (pull) and check structure
-cd "$TEST_DIR/raw_backend"
-git pull origin master
-
-# Count commits? Repack might add a commit?
-# Repack reads all objects, creates 1 new pack, updates manifest.
-# This results in a NEW commit on the backend that has the new manifest.
-# The OLD packs are removed (deleted from backend).
-# So we should see a new commit.
 # Check if commit SHA changed. Repack force-pushes a new manifest state.
+cd "$TEST_DIR/raw_backend_verify"
 NEW_HEAD=$(git rev-parse HEAD)
 echo "Old HEAD: $HEAD_SHA"
 echo "New HEAD: $NEW_HEAD"