41ac414ea2
Originally, test_expect_failure was designed to be the opposite
of test_expect_success, but this was a bad decision. Most tests
run a series of commands that leads to the single command that
needs to be tested, like this:
test_expect_{success,failure} 'test title' '
setup1 &&
setup2 &&
setup3 &&
what is to be tested
'
And expecting a failure exit from the whole sequence misses the
point of writing tests. Your setup$N that are supposed to
succeed may have failed without even reaching what you are
trying to test. The only valid use of test_expect_failure is to
check a trivial single command that is expected to fail, which
is a minority in tests of Porcelain-ish commands.
This large-ish patch rewrites all uses of test_expect_failure to
use test_expect_success and rewrites the condition of what is
tested, like this:
test_expect_success 'test title' '
setup1 &&
setup2 &&
setup3 &&
! this command should fail
'
test_expect_failure is redefined to serve as a reminder that
that test *should* succeed but due to a known breakage in git it
currently does not pass. So if git-foo command should create a
file 'bar' but you discovered a bug that it doesn't, you can
write a test like this:
test_expect_failure 'git-foo should create bar' '
rm -f bar &&
git foo &&
test -f bar
'
This construct acts similar to test_expect_success, but instead
of reporting "ok/FAIL" like test_expect_success does, the
outcome is reported as "FIXED/still broken".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
62 lines
1.5 KiB
Bash
Executable File
62 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Johannes Sixt
|
|
#
|
|
|
|
test_description='merging symlinks on filesystem w/o symlink support.
|
|
|
|
This tests that git-merge-recursive writes merge results as plain files
|
|
if core.symlinks is false.'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success \
|
|
'setup' '
|
|
git config core.symlinks false &&
|
|
> file &&
|
|
git add file &&
|
|
git-commit -m initial &&
|
|
git branch b-symlink &&
|
|
git branch b-file &&
|
|
l=$(echo -n file | git-hash-object -t blob -w --stdin) &&
|
|
echo "120000 $l symlink" | git update-index --index-info &&
|
|
git-commit -m master &&
|
|
git-checkout b-symlink &&
|
|
l=$(echo -n file-different | git-hash-object -t blob -w --stdin) &&
|
|
echo "120000 $l symlink" | git update-index --index-info &&
|
|
git-commit -m b-symlink &&
|
|
git-checkout b-file &&
|
|
echo plain-file > symlink &&
|
|
git add symlink &&
|
|
git-commit -m b-file'
|
|
|
|
test_expect_success \
|
|
'merge master into b-symlink, which has a different symbolic link' '
|
|
git-checkout b-symlink &&
|
|
! git-merge master'
|
|
|
|
test_expect_success \
|
|
'the merge result must be a file' '
|
|
test -f symlink'
|
|
|
|
test_expect_success \
|
|
'merge master into b-file, which has a file instead of a symbolic link' '
|
|
git-reset --hard && git-checkout b-file &&
|
|
! git-merge master'
|
|
|
|
test_expect_success \
|
|
'the merge result must be a file' '
|
|
test -f symlink'
|
|
|
|
test_expect_success \
|
|
'merge b-file, which has a file instead of a symbolic link, into master' '
|
|
git-reset --hard &&
|
|
git-checkout master &&
|
|
! git-merge b-file'
|
|
|
|
test_expect_success \
|
|
'the merge result must be a file' '
|
|
test -f symlink'
|
|
|
|
test_done
|