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

t3600-rm: skip failed-remove test when we cannot make an unremovable file.

Browse Source 
When running t3600-rm test under fakeroot (or as root), we
cannot make a file unremovable with "chmod a-w .".  Detect this
case early and skip that test.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-04-13 11:57:57 -07:00
parent f43ba60e2c
commit 2283645b85
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
t/t3600-rm.sh
View File

@ -23,6 +23,16 @@ else
test_tabs=n test_tabs=n
fi fi
# Later we will try removing an unremovable path to make sure
# git-rm barfs, but if the test is run as root that cannot be
# arranged.
: >test-file
chmod a-w .
rm -f test-file
test -f test-file && test_failed_remove=y
chmod 775 .
rm -f test-file
test_expect_success \ test_expect_success \
'Pre-check that foo exists and is in index before git-rm foo' \ 'Pre-check that foo exists and is in index before git-rm foo' \
'[ -f foo ] && git-ls-files --error-unmatch foo' '[ -f foo ] && git-ls-files --error-unmatch foo'
@ -56,12 +66,14 @@ test "$test_tabs" = y && test_expect_success \
"git-rm -f 'space embedded' 'tab embedded' 'newline "git-rm -f 'space embedded' 'tab embedded' 'newline
embedded'" embedded'"
if test "$test_tabs" = y; then if test "$test_failed_remove" = y; then
chmod u-w . chmod a-w .
test_expect_failure \ test_expect_failure \
'Test that "git-rm -f" fails if its rm fails' \ 'Test that "git-rm -f" fails if its rm fails' \
'git-rm -f baz' 'git-rm -f baz'
chmod u+w . chmod 775 .
else
test_expect_success 'skipping removal failure (perhaps running as root?)' :
fi fi
test_expect_success \ test_expect_success \