global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: try to work around issues with the test cleanup

Browse Source 
It seems that on some build agents, there might be some transient file
locking issues, so when we cannot delete the trash directory, let's be
gentle and try again five seconds later, and only error out if it still
fails the second time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-12-12 22:09:24 +01:00
parent 39ce1fdd3a
commit d790b5e9bf
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
t/test-lib.sh
View File

@@ -880,7 +880,11 @@ test_done () {
error "Tests passed but trash directory already removed before test cleanup; aborting"
cd "$TRASH_DIRECTORY/.." &&
rm -fr "$TRASH_DIRECTORY" ||
rm -fr "$TRASH_DIRECTORY" || {
# try again in a bit
sleep 5;
rm -fr "$TRASH_DIRECTORY"
} ||
error "Tests passed but test cleanup failed; aborting"
fi
test_at_end_hook_