mirror of
https://github.com/git/git.git
synced 2024-11-18 19:13:58 +01:00
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>
52 lines
1.2 KiB
Bash
Executable File
52 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git checkout-index test.
|
|
|
|
This test registers the following filesystem structure in the
|
|
cache:
|
|
|
|
path0 - a file
|
|
path1/file1 - a file in a directory
|
|
|
|
And then tries to checkout in a work tree that has the following:
|
|
|
|
path0/file0 - a file in a directory
|
|
path1 - a file
|
|
|
|
The git checkout-index command should fail when attempting to checkout
|
|
path0, finding it is occupied by a directory, and path1/file1, finding
|
|
path1 is occupied by a non-directory. With "-f" flag, it should remove
|
|
the conflicting paths and succeed.
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
date >path0
|
|
mkdir path1
|
|
date >path1/file1
|
|
|
|
test_expect_success \
|
|
'git update-index --add various paths.' \
|
|
'git update-index --add path0 path1/file1'
|
|
|
|
rm -fr path0 path1
|
|
mkdir path0
|
|
date >path0/file0
|
|
date >path1
|
|
|
|
test_expect_success \
|
|
'git checkout-index without -f should fail on conflicting work tree.' \
|
|
'! git checkout-index -a'
|
|
|
|
test_expect_success \
|
|
'git checkout-index with -f should succeed.' \
|
|
'git checkout-index -f -a'
|
|
|
|
test_expect_success \
|
|
'git checkout-index conflicting paths.' \
|
|
'test -f path0 && test -d path1 && test -f path1/file1'
|
|
|
|
test_done
|