git/t/t1200-tutorial.sh at b8d97d07fd5025232cae74cfc9a555abd9ac390e - mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-13 20:53:02 +01:00

Junio C Hamano 41ac414ea2 Sane use of test_expect_failure

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>

2008-02-01 20:49:34 -08:00

163 lines

4 KiB

Bash

Executable file

Raw Blame History

 #!/bin/sh
 #
 # Copyright (c) 2005 Johannes Schindelin
 #
 test_description='A simple turial in the form of a test case'
 . ./test-lib.sh
 echo "Hello World" > hello
 echo "Silly example" > example
 git update-index --add hello example
 test_expect_success 'blob' "test blob = \"$(git cat-file -t 557db03)\""
 test_expect_success 'blob 557db03' "test \"Hello World\" = \"$(git cat-file blob 557db03)\""
 echo "It's a new day for git" >>hello
 cat > diff.expect << EOF
 diff --git a/hello b/hello
 index 557db03..263414f 100644
 --- a/hello
 +++ b/hello
@@ -1 +1,2 @@
  Hello World
 +It's a new day for git
 EOF
 git diff-files -p > diff.output
 test_expect_success 'git diff-files -p' 'cmp diff.expect diff.output'
 git diff > diff.output
 test_expect_success 'git diff' 'cmp diff.expect diff.output'
 tree=$(git write-tree 2>/dev/null)
 test_expect_success 'tree' "test 8988da15d077d4829fc51d8544c097def6644dbb = $tree"
 output="$(echo "Initial commit" | git commit-tree $(git write-tree) 2>&1 > .git/refs/heads/master)"
 git diff-index -p HEAD > diff.output
 test_expect_success 'git diff-index -p HEAD' 'cmp diff.expect diff.output'
 git diff HEAD > diff.output
 test_expect_success 'git diff HEAD' 'cmp diff.expect diff.output'
 #rm hello
 #test_expect_success 'git read-tree --reset HEAD' "git read-tree --reset HEAD ; test \"hello: needs update\" = \"$(git update-index --refresh)\""
 cat > whatchanged.expect << EOF
 commit VARIABLE
 Author: VARIABLE
 Date:   VARIABLE
     Initial commit
 diff --git a/example b/example
 new file mode 100644
 index 0000000..f24c74a
 --- /dev/null
 +++ b/example
@@ -0,0 +1 @@
 +Silly example
 diff --git a/hello b/hello
 new file mode 100644
 index 0000000..557db03
 --- /dev/null
 +++ b/hello
@@ -0,0 +1 @@
 +Hello World
 EOF
 git whatchanged -p --root | \
 	sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
 		-e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
 > whatchanged.output
 test_expect_success 'git whatchanged -p --root' 'cmp whatchanged.expect whatchanged.output'
 git tag my-first-tag
 test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs/tags/my-first-tag'
 # TODO: test git-clone
 git checkout -b mybranch
 test_expect_success 'git checkout -b mybranch' 'cmp .git/refs/heads/master .git/refs/heads/mybranch'
 cat > branch.expect <<EOF
   master
 * mybranch
 EOF
 git branch > branch.output
 test_expect_success 'git branch' 'cmp branch.expect branch.output'
 git checkout mybranch
 echo "Work, work, work" >>hello
 git commit -m 'Some work.' -i hello
 git checkout master
 echo "Play, play, play" >>hello
 echo "Lots of fun" >>example
 git commit -m 'Some fun.' -i hello example
 test_expect_success 'git resolve now fails' '
 	! git merge -m "Merge work in mybranch" mybranch
 '
 cat > hello << EOF
 Hello World
 It's a new day for git
 Play, play, play
 Work, work, work
 EOF
 git commit -m 'Merged "mybranch" changes.' -i hello
 test_done
 cat > show-branch.expect << EOF
 * [master] Merged "mybranch" changes.
  ! [mybranch] Some work.
 --
 -  [master] Merged "mybranch" changes.
 *+ [mybranch] Some work.
 EOF
 git show-branch --topo-order master mybranch > show-branch.output
 test_expect_success 'git show-branch' 'cmp show-branch.expect show-branch.output'
 git checkout mybranch
 cat > resolve.expect << EOF
 Updating from VARIABLE to VARIABLE
  example |    1 +
  hello   |    1 +
 files changed, 2 insertions(+), 0 deletions(-)
 EOF
 git merge -s "Merge upstream changes." master | \
 	sed -e "1s/[0-9a-f]\{40\}/VARIABLE/g" >resolve.output
 test_expect_success 'git resolve' 'cmp resolve.expect resolve.output'
 cat > show-branch2.expect << EOF
 ! [master] Merged "mybranch" changes.
  * [mybranch] Merged "mybranch" changes.
 --
 -- [master] Merged "mybranch" changes.
 EOF
 git show-branch --topo-order master mybranch > show-branch2.output
 test_expect_success 'git show-branch' 'cmp show-branch2.expect show-branch2.output'
 # TODO: test git fetch
 # TODO: test git push
 test_expect_success 'git repack' 'git repack'
 test_expect_success 'git prune-packed' 'git prune-packed'
 test_expect_success '-> only packed objects' '
 	! find -type f .git/objects/[0-9a-f][0-9a-f]
 '
 test_done