mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/test-cleanly-recreate-trash-directory'

Browse Source 
Improve test framework around unwritable directories.

* ab/test-cleanly-recreate-trash-directory:
  test-lib.sh: try to re-chmod & retry on failed trash removal
This commit is contained in:
Junio C Hamano
2021-10-25 16:07:00 -07:00
parent 97ab03b12a 5d22e18965
commit 67f310e1ad
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/test-lib.sh
View File

@ -1407,8 +1407,20 @@ HOME="$TRASH_DIRECTORY"
GNUPGHOME="$HOME/gnupg-home-not-used" GNUPGHOME="$HOME/gnupg-home-not-used"
export HOME GNUPGHOME USER_HOME export HOME GNUPGHOME USER_HOME
# "rm -rf" existing trash directory, even if a previous run left it
# with bad permissions.
remove_trash_directory () {
dir="$1"
if ! rm -rf "$dir" 2>/dev/null
then
chmod -R u+rwx "$dir"
rm -rf "$dir"
fi
! test -d "$dir"
}
# Test repository # Test repository
rm -fr "$TRASH_DIRECTORY" || { remove_trash_directory "$TRASH_DIRECTORY" || {
GIT_EXIT_OK=t GIT_EXIT_OK=t
echo >&5 "FATAL: Cannot prepare test area" echo >&5 "FATAL: Cannot prepare test area"
exit 1 exit 1