summaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2017-05-22 14:17:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-23 05:29:51 (GMT)
commit23739aa2b3d2546c3b3ff0e06eb5171b37e31a90 (patch)
tree1f86a3f21fa4fa01517c13d691d7e00778bfe83c /t/t3600-rm.sh
parentca7b2ab07da7551a16f1eed49ade21aa5334021b (diff)
downloadgit-23739aa2b3d2546c3b3ff0e06eb5171b37e31a90.zip
git-23739aa2b3d2546c3b3ff0e06eb5171b37e31a90.tar.gz
git-23739aa2b3d2546c3b3ff0e06eb5171b37e31a90.tar.bz2
t3600: clean up permissions test properly
The test of failing `git rm -f` removes the write permissions on the test directory, but fails to restore them if the test fails. This means that the test temporary directory cannot be cleaned up, which means that subsequent attempts to run the test fail mysteriously. Instead, do the cleanup in a `test_when_finished` block so that it can't be skipped. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-xt/t3600-rm.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 5f9913b..f8568f8 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -97,9 +97,9 @@ test_expect_success FUNNYNAMES \
embedded'"
test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
+ test_when_finished "chmod 775 ." &&
chmod a-w . &&
- test_must_fail git rm -f baz &&
- chmod 775 .
+ test_must_fail git rm -f baz
'
test_expect_success \