mirror of
https://github.com/git/git.git
synced 2024-11-18 19:03:52 +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>
221 lines
4.0 KiB
Bash
Executable File
221 lines
4.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='commit-msg hook'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'with no hook' '
|
|
|
|
echo "foo" > file &&
|
|
git add file &&
|
|
git commit -m "first"
|
|
|
|
'
|
|
|
|
# set up fake editor for interactive editing
|
|
cat > fake-editor <<'EOF'
|
|
#!/bin/sh
|
|
cp FAKE_MSG "$1"
|
|
exit 0
|
|
EOF
|
|
chmod +x fake-editor
|
|
FAKE_EDITOR="$(pwd)/fake-editor"
|
|
export FAKE_EDITOR
|
|
|
|
test_expect_success 'with no hook (editor)' '
|
|
|
|
echo "more foo" >> file &&
|
|
git add file &&
|
|
echo "more foo" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with no hook' '
|
|
|
|
echo "bar" > file &&
|
|
git add file &&
|
|
git commit --no-verify -m "bar"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with no hook (editor)' '
|
|
|
|
echo "more bar" > file &&
|
|
git add file &&
|
|
echo "more bar" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
|
|
|
|
'
|
|
|
|
# now install hook that always succeeds
|
|
HOOKDIR="$(git rev-parse --git-dir)/hooks"
|
|
HOOK="$HOOKDIR/commit-msg"
|
|
mkdir -p "$HOOKDIR"
|
|
cat > "$HOOK" <<EOF
|
|
#!/bin/sh
|
|
exit 0
|
|
EOF
|
|
chmod +x "$HOOK"
|
|
|
|
test_expect_success 'with succeeding hook' '
|
|
|
|
echo "more" >> file &&
|
|
git add file &&
|
|
git commit -m "more"
|
|
|
|
'
|
|
|
|
test_expect_success 'with succeeding hook (editor)' '
|
|
|
|
echo "more more" >> file &&
|
|
git add file &&
|
|
echo "more more" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with succeeding hook' '
|
|
|
|
echo "even more" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "even more"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with succeeding hook (editor)' '
|
|
|
|
echo "even more more" >> file &&
|
|
git add file &&
|
|
echo "even more more" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
|
|
|
|
'
|
|
|
|
# now a hook that fails
|
|
cat > "$HOOK" <<EOF
|
|
#!/bin/sh
|
|
exit 1
|
|
EOF
|
|
|
|
test_expect_success 'with failing hook' '
|
|
|
|
echo "another" >> file &&
|
|
git add file &&
|
|
! git commit -m "another"
|
|
|
|
'
|
|
|
|
test_expect_success 'with failing hook (editor)' '
|
|
|
|
echo "more another" >> file &&
|
|
git add file &&
|
|
echo "more another" > FAKE_MSG &&
|
|
! (GIT_EDITOR="$FAKE_EDITOR" git commit)
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with failing hook' '
|
|
|
|
echo "stuff" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "stuff"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with failing hook (editor)' '
|
|
|
|
echo "more stuff" >> file &&
|
|
git add file &&
|
|
echo "more stuff" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
|
|
|
|
'
|
|
|
|
chmod -x "$HOOK"
|
|
test_expect_success 'with non-executable hook' '
|
|
|
|
echo "content" >> file &&
|
|
git add file &&
|
|
git commit -m "content"
|
|
|
|
'
|
|
|
|
test_expect_success 'with non-executable hook (editor)' '
|
|
|
|
echo "content again" >> file &&
|
|
git add file &&
|
|
echo "content again" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit -m "content again"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with non-executable hook' '
|
|
|
|
echo "more content" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "more content"
|
|
|
|
'
|
|
|
|
test_expect_success '--no-verify with non-executable hook (editor)' '
|
|
|
|
echo "even more content" >> file &&
|
|
git add file &&
|
|
echo "even more content" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify
|
|
|
|
'
|
|
|
|
# now a hook that edits the commit message
|
|
cat > "$HOOK" <<'EOF'
|
|
#!/bin/sh
|
|
echo "new message" > "$1"
|
|
exit 0
|
|
EOF
|
|
chmod +x "$HOOK"
|
|
|
|
commit_msg_is () {
|
|
test "`git log --pretty=format:%s%b -1`" = "$1"
|
|
}
|
|
|
|
test_expect_success 'hook edits commit message' '
|
|
|
|
echo "additional" >> file &&
|
|
git add file &&
|
|
git commit -m "additional" &&
|
|
commit_msg_is "new message"
|
|
|
|
'
|
|
|
|
test_expect_success 'hook edits commit message (editor)' '
|
|
|
|
echo "additional content" >> file &&
|
|
git add file &&
|
|
echo "additional content" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit &&
|
|
commit_msg_is "new message"
|
|
|
|
'
|
|
|
|
test_expect_success "hook doesn't edit commit message" '
|
|
|
|
echo "plus" >> file &&
|
|
git add file &&
|
|
git commit --no-verify -m "plus" &&
|
|
commit_msg_is "plus"
|
|
|
|
'
|
|
|
|
test_expect_success "hook doesn't edit commit message (editor)" '
|
|
|
|
echo "more plus" >> file &&
|
|
git add file &&
|
|
echo "more plus" > FAKE_MSG &&
|
|
GIT_EDITOR="$FAKE_EDITOR" git commit --no-verify &&
|
|
commit_msg_is "more plus"
|
|
|
|
'
|
|
|
|
test_done
|