undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-lib: abort when can't remove trash directory

Browse Source 
We had two similar bugs in the tests sporadically triggering error
messages during the removal of the trash directory, see commits
bb05510e5 (t5510: run auto-gc in the foreground, 2016-05-01) and
ef09036cf (t6500: wait for detached auto gc at the end of the test
script, 2017-04-13).  The test script succeeded nonetheless, because
these errors are ignored during housekeeping in 'test_done'.

However, such an error is a sign that something is fishy in the test
script.  Print an error message and abort the test script when the
trash directory can't be removed successfully or is already removed,
because that's unexpected and we would prefer somebody notice and
figure out why.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2017-04-20 18:52:30 +02:00 committed by Junio C Hamano
parent ef09036cf3
commit df4c0d1a79
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
t/test-lib.sh
View File

@ -760,9 +760,12 @@ test_done () {
say "1..$test_count$skip_all"
fi
test -d "$remove_trash" &&
test -d "$remove_trash" ||
error "Tests passed but trash directory already removed before test cleanup; aborting"
cd "$(dirname "$remove_trash")" &&
rm -rf "$(basename "$remove_trash")"
rm -rf "$(basename "$remove_trash")" ||
error "Tests passed but test cleanup failed; aborting"
test_at_end_hook_