mirror of
https://github.com/git/git.git
synced 2024-11-18 04:04:11 +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>
120 lines
3.0 KiB
Bash
Executable File
120 lines
3.0 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git apply handling binary patches
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
# setup
|
|
|
|
cat >file1 <<EOF
|
|
A quick brown fox jumps over the lazy dog.
|
|
A tiny little penguin runs around in circles.
|
|
There is a flag with Linux written on it.
|
|
A slow black-and-white panda just sits there,
|
|
munching on his bamboo.
|
|
EOF
|
|
cat file1 >file2
|
|
cat file1 >file4
|
|
|
|
git update-index --add --remove file1 file2 file4
|
|
git-commit -m 'Initial Version' 2>/dev/null
|
|
|
|
git-checkout -b binary
|
|
tr 'x' '\000' <file1 >file3
|
|
cat file3 >file4
|
|
git add file2
|
|
tr '\000' 'v' <file3 >file1
|
|
rm -f file2
|
|
git update-index --add --remove file1 file2 file3 file4
|
|
git-commit -m 'Second Version'
|
|
|
|
git diff-tree -p master binary >B.diff
|
|
git diff-tree -p -C master binary >C.diff
|
|
|
|
git diff-tree -p --binary master binary >BF.diff
|
|
git diff-tree -p --binary -C master binary >CF.diff
|
|
|
|
test_expect_success 'stat binary diff -- should not fail.' \
|
|
'git-checkout master
|
|
git apply --stat --summary B.diff'
|
|
|
|
test_expect_success 'stat binary diff (copy) -- should not fail.' \
|
|
'git-checkout master
|
|
git apply --stat --summary C.diff'
|
|
|
|
test_expect_success 'check binary diff -- should fail.' \
|
|
'git-checkout master &&
|
|
! git apply --check B.diff'
|
|
|
|
test_expect_success 'check binary diff (copy) -- should fail.' \
|
|
'git-checkout master &&
|
|
! git apply --check C.diff'
|
|
|
|
test_expect_success \
|
|
'check incomplete binary diff with replacement -- should fail.' '
|
|
git-checkout master &&
|
|
! git apply --check --allow-binary-replacement B.diff
|
|
'
|
|
|
|
test_expect_success \
|
|
'check incomplete binary diff with replacement (copy) -- should fail.' '
|
|
git-checkout master &&
|
|
! git apply --check --allow-binary-replacement C.diff
|
|
'
|
|
|
|
test_expect_success 'check binary diff with replacement.' \
|
|
'git-checkout master
|
|
git apply --check --allow-binary-replacement BF.diff'
|
|
|
|
test_expect_success 'check binary diff with replacement (copy).' \
|
|
'git-checkout master
|
|
git apply --check --allow-binary-replacement CF.diff'
|
|
|
|
# Now we start applying them.
|
|
|
|
do_reset () {
|
|
rm -f file? &&
|
|
git-reset --hard &&
|
|
git-checkout -f master
|
|
}
|
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
'do_reset &&
|
|
! git apply B.diff'
|
|
|
|
test_expect_success 'apply binary diff -- should fail.' \
|
|
'do_reset &&
|
|
! git apply --index B.diff'
|
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
'do_reset &&
|
|
! git apply C.diff'
|
|
|
|
test_expect_success 'apply binary diff (copy) -- should fail.' \
|
|
'do_reset &&
|
|
! git apply --index C.diff'
|
|
|
|
test_expect_success 'apply binary diff without replacement.' \
|
|
'do_reset &&
|
|
git apply BF.diff'
|
|
|
|
test_expect_success 'apply binary diff without replacement (copy).' \
|
|
'do_reset &&
|
|
git apply CF.diff'
|
|
|
|
test_expect_success 'apply binary diff.' \
|
|
'do_reset &&
|
|
git apply --allow-binary-replacement --index BF.diff &&
|
|
test -z "$(git diff --name-status binary)"'
|
|
|
|
test_expect_success 'apply binary diff (copy).' \
|
|
'do_reset &&
|
|
git apply --allow-binary-replacement --index CF.diff &&
|
|
test -z "$(git diff --name-status binary)"'
|
|
|
|
test_done
|