Fix testing on Alpine (#1213)

Author: joshrabinowitz

tests/_test_base.bash

@@ -125,9 +125,10 @@ function stop_gpg_agent {
       '/gpg-agent/ { if ( $0 !~ "awk" ) { system("kill "$1) } }' >> "$TEST_OUTPUT_FILE" 2>&1
   else
     local ps_is_busybox
-    ps_is_busybox=_exe_is_busybox 'ps'
+    ps_is_busybox=$(_exe_is_busybox 'ps')
     if [[ $ps_is_busybox -eq '1' ]]; then
-      echo '# git-secret: tests: not stopping gpg-agent on busybox' >&3
+      # On Alpine/busybox, ps doesn't show command arguments, so use gpgconf instead
+      gpgconf --homedir "$TEST_GPG_HOMEDIR" --kill gpg-agent >> "$TEST_OUTPUT_FILE" 2>&1 || true
     else
       ps -wx -U "$username" | gawk \
         '/gpg-agent --homedir/ { if ( $0 !~ "awk" ) { system("kill "$1) } }' >> "$TEST_OUTPUT_FILE" 2>&1
@@ -246,6 +247,12 @@ function remove_git_repository {
 function set_state_initial {
   cd "$BATS_TMPDIR" || exit 1
   rm -rf "${BATS_TMPDIR:?}/*"
+  # Safety net: remove hidden dirs that may persist from a prior failed teardown.
+  # The rm above is a no-op (glob inside double quotes is literal), so we must
+  # explicitly clean up dot-dirs to prevent 'already initialized' errors.
+  rm -rf "${BATS_TMPDIR:?}/${_SECRETS_DIR}"
+  rm -rf "${BATS_TMPDIR:?}/.git"
+  rm -rf "${BATS_TMPDIR:?}/.gitignore"
 }
 
 

tests/test_reveal.bats

@@ -22,7 +22,7 @@ function setup {
 
 
 function teardown {
-  rm "$FILE_TO_HIDE"
+  rm -f "$FILE_TO_HIDE"
 
   uninstall_fixture_full_key "$TEST_DEFAULT_USER" "$FINGERPRINT"
   unset_current_state

tests/test_reveal_filename.bats

@@ -26,7 +26,7 @@ function setup {
 
 
 function teardown {
-  rm "$FILE_TO_HIDE"
+  rm -f "$FILE_TO_HIDE"
 
   uninstall_fixture_full_key "$TEST_DEFAULT_USER" "$FINGERPRINT"
   unset_current_state