mirror of
https://github.com/git/git.git
synced 2024-11-18 23:14:51 +01:00
22669a045a
Moved the setup commands into test_expect_success blocks so their output is hidden unless -v is used. This makes the test suite look a little cleaner when the rm test-file setup step fails (and was expected to fail for most cases). Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
87 lines
2.5 KiB
Bash
Executable file
87 lines
2.5 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Carl D. Worth
|
|
#
|
|
|
|
test_description='Test of the various options to git-rm.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# Setup some files to be removed, some with funny characters
|
|
test_expect_success \
|
|
'Initialize test directory' \
|
|
"touch -- foo bar baz 'space embedded' -q &&
|
|
git-add -- foo bar baz 'space embedded' -q &&
|
|
git-commit -m 'add normal files' &&
|
|
test_tabs=y &&
|
|
if touch -- 'tab embedded' 'newline
|
|
embedded'
|
|
then
|
|
git-add -- 'tab embedded' 'newline
|
|
embedded' &&
|
|
git-commit -m 'add files with tabs and newlines'
|
|
else
|
|
say 'Your filesystem does not allow tabs in filenames.'
|
|
test_tabs=n
|
|
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_expect_success \
|
|
'Determine rm behavior' \
|
|
': >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 \
|
|
'Pre-check that foo exists and is in index before git-rm foo' \
|
|
'[ -f foo ] && git-ls-files --error-unmatch foo'
|
|
|
|
test_expect_success \
|
|
'Test that git-rm foo succeeds' \
|
|
'git-rm foo'
|
|
|
|
test_expect_success \
|
|
'Post-check that foo exists but is not in index after git-rm foo' \
|
|
'[ -f foo ] && ! git-ls-files --error-unmatch foo'
|
|
|
|
test_expect_success \
|
|
'Pre-check that bar exists and is in index before "git-rm -f bar"' \
|
|
'[ -f bar ] && git-ls-files --error-unmatch bar'
|
|
|
|
test_expect_success \
|
|
'Test that "git-rm -f bar" succeeds' \
|
|
'git-rm -f bar'
|
|
|
|
test_expect_success \
|
|
'Post-check that bar does not exist and is not in index after "git-rm -f bar"' \
|
|
'! [ -f bar ] && ! git-ls-files --error-unmatch bar'
|
|
|
|
test_expect_success \
|
|
'Test that "git-rm -- -q" succeeds (remove a file that looks like an option)' \
|
|
'git-rm -- -q'
|
|
|
|
test "$test_tabs" = y && test_expect_success \
|
|
"Test that \"git-rm -f\" succeeds with embedded space, tab, or newline characters." \
|
|
"git-rm -f 'space embedded' 'tab embedded' 'newline
|
|
embedded'"
|
|
|
|
if test "$test_failed_remove" = y; then
|
|
chmod a-w .
|
|
test_expect_failure \
|
|
'Test that "git-rm -f" fails if its rm fails' \
|
|
'git-rm -f baz'
|
|
chmod 775 .
|
|
else
|
|
test_expect_success 'skipping removal failure (perhaps running as root?)' :
|
|
fi
|
|
|
|
test_expect_success \
|
|
'When the rm in "git-rm -f" fails, it should not remove the file from the index' \
|
|
'git-ls-files --error-unmatch baz'
|
|
|
|
test_done
|