1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
git/t
Eric Wong 8641fb24ee typechange tests for git apply (currently failing)
I've found that git apply is incapable of handling patches
involving object type changes to the same path.

Of course git itself is perfectly capable of making commits that
generate these changes, as it only tracks trees states.  It's
just that the diffs between them are less useful if they can't
be applied.

Some of these are rare, but I've hit one of them (file becoming
a symlink) recently in real-world usage, and was inspired to
find more potential breakages :)

I'm not sure when I'll have time to fix these myself and I'm not
very familiar with the apply code.   So if someone could get
some or all of these cases working, they would be my hero :)

Some of these are what I would refer to as corner-cases from
hell.  Most (if not all) other systems fail some of these.  In
fact, they aren't even capable of representing most of these
changes in their histories; much less being able to handle
patches to that effect.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-16 22:15:21 -07:00
..
t4013 Adjust t4013 tests to corrected format-patch. 2006-07-13 21:40:44 -07:00
t4100
t4101 Make t4101-apply-nonl bring along its patches 2006-06-17 16:06:21 -07:00
t5100 t5100: mailinfo and mailsplit tests. 2006-06-17 16:26:20 -07:00
.gitignore gitignore: Ignore some more boring things. 2006-03-05 11:26:18 -08:00
annotate-tests.sh tests: Set EDITOR=: and VISUAL=: globally 2006-07-11 12:32:54 -07:00
diff-lib.sh
lib-git-svn.sh git-svn: migrate out of contrib (follow-up) 2006-07-07 03:17:59 -07:00
lib-read-tree-m-3way.sh
Makefile git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
README t/README: start testing porcelainish 2006-06-28 11:45:52 -07:00
t0000-basic.sh write-tree: --prefix=<path> 2006-05-01 22:29:16 -07:00
t0010-racy-git.sh
t1000-read-tree-m-3way.sh
t1001-read-tree-m-2way.sh Libify diff-files. 2006-04-22 02:37:45 -07:00
t1002-read-tree-m-u-2way.sh t1002: use -U0 instead of --unified=0 2006-05-28 09:43:18 -07:00
t1100-commit-tree-options.sh
t1200-tutorial.sh Merge branch 'fix' 2006-04-20 02:52:04 -07:00
t1300-repo-config.sh Fix setting config variables with an alternative GIT_CONFIG 2006-06-19 17:30:34 -07:00
t1400-update-ref.sh tests: Set EDITOR=: and VISUAL=: globally 2006-07-11 12:32:54 -07:00
t2000-checkout-cache-clash.sh
t2001-checkout-cache-clash.sh
t2002-checkout-cache-u.sh
t2003-checkout-cache-mkdir.sh
t2004-checkout-cache-temp.sh Add --temp and --stage=all options to checkout-index. 2006-03-05 00:58:13 -08:00
t2100-update-cache-badpath.sh
t2101-update-index-reupdate.sh tests: Remove heredoc usage inside quotes 2006-05-25 23:53:31 -07:00
t3000-ls-files-others.sh
t3001-ls-files-others-exclude.sh avoid echo -e, there are systems where it does not work 2006-02-12 11:36:19 -08:00
t3002-ls-files-dashpath.sh
t3010-ls-files-killed-modified.sh
t3020-ls-files-error-unmatch.sh git-ls-files: Fix, document, and add test for --error-unmatch option. 2006-02-21 18:37:36 -08:00
t3100-ls-tree-restrict.sh
t3101-ls-tree-dirname.sh
t3200-branch.sh Test that git-branch -l works. 2006-05-24 22:26:47 -07:00
t3300-funny-names.sh t3300-funny-names: shell portability fixes 2006-05-25 23:53:31 -07:00
t3400-rebase.sh
t3401-rebase-partial.sh rebase: allow --merge option to handle patches merged upstream 2006-06-25 00:38:34 -07:00
t3402-rebase-merge.sh rebase: error out for NO_PYTHON if they use recursive merge 2006-06-21 03:56:30 -07:00
t3403-rebase-skip.sh rebase: allow --skip to work with --merge 2006-06-25 00:38:34 -07:00
t3500-cherry.sh read-tree -m -u: do not overwrite or remove untracked working tree files. 2006-05-17 01:52:48 -07:00
t3600-rm.sh Remove unnecessary output from t3600-rm. 2006-05-29 11:31:58 -07:00
t3700-add.sh git-add: Add support for --, documentation, and test. 2006-02-21 17:33:43 -08:00
t4000-diff-format.sh
t4001-diff-rename.sh xdiff: Show function names in hunk headers. 2006-03-27 18:43:51 -08:00
t4002-diff-basic.sh read-tree -m -u: do not overwrite or remove untracked working tree files. 2006-05-17 01:52:48 -07:00
t4003-diff-rename-1.sh
t4004-diff-rename-symlink.sh
t4005-diff-rename-2.sh
t4006-diff-mode.sh
t4007-rename-3.sh
t4008-diff-break-rewrite.sh
t4009-diff-rename-4.sh
t4010-diff-pathspec.sh Libify diff-index. 2006-04-22 02:43:00 -07:00
t4011-diff-symlink.sh
t4012-diff-binary.sh tests: Remove heredoc usage inside quotes 2006-05-25 23:53:31 -07:00
t4013-diff-various.sh t4013 diff format tests update 2006-07-13 21:40:43 -07:00
t4014-format-patch.sh t4014: fix test commit labels. 2006-06-28 22:48:34 -07:00
t4100-apply-stat.sh
t4101-apply-nonl.sh Make t4101-apply-nonl bring along its patches 2006-06-17 16:06:21 -07:00
t4102-apply-rename.sh
t4103-apply-binary.sh
t4109-apply-multifrag.sh
t4110-apply-scan.sh
t4112-apply-renames.sh
t4113-apply-ending.sh apply: force matching at the beginning. 2006-05-24 13:23:31 -07:00
t4114-apply-typechange.sh typechange tests for git apply (currently failing) 2006-07-16 22:15:21 -07:00
t5000-tar-tree.sh tar-tree: Use the prefix field of a tar header 2006-03-25 16:40:34 -08:00
t5100-mailinfo.sh t5100: mailinfo and mailsplit tests. 2006-06-17 16:26:20 -07:00
t5300-pack-object.sh
t5400-send-pack.sh
t5500-fetch-pack.sh t5500-fetch-pack: remove local (bashism) usage. 2006-05-25 23:53:31 -07:00
t5600-clone-fail-cleanup.sh New test to verify that when git-clone fails it cleans up the new directory. 2006-02-21 18:18:25 -08:00
t5700-clone-reference.sh Fix more typos, primarily in the code 2006-07-10 00:36:44 -07:00
t5710-info-alternate.sh Fix more typos, primarily in the code 2006-07-10 00:36:44 -07:00
t6000lib.sh t6000lib: workaround a possible dash bug 2006-05-25 23:53:31 -07:00
t6002-rev-list-bisect.sh Fix more typos, primarily in the code 2006-07-10 00:36:44 -07:00
t6003-rev-list-topo-order.sh
t6010-merge-base.sh Additional merge-base tests (revised) 2006-07-09 03:38:12 -07:00
t6020-merge-df.sh
t6021-merge-criss-cross.sh Fix more typos, primarily in the code 2006-07-10 00:36:44 -07:00
t6022-merge-rename.sh read-tree -m -u: do not overwrite or remove untracked working tree files. 2006-05-17 01:52:48 -07:00
t6101-rev-parse-parents.sh tests: adjust breakage by stricter rev-parse 2006-01-25 15:10:22 -08:00
t6200-fmt-merge-msg.sh t6200: fmt-merge-msg test. 2006-07-03 19:12:43 -07:00
t7001-mv.sh git-mv: fix moves into a subdir from outside 2006-03-03 11:28:28 -08:00
t7101-reset.sh Make git-reset delete empty directories 2006-02-17 23:52:57 -08:00
t7201-co.sh checkout -m: fix read-tree invocation 2006-06-28 19:30:51 -07:00
t8001-annotate.sh t8001-annotate: fix a bash-ism in this test 2006-07-04 02:55:52 -07:00
t8002-blame.sh annotate-blame test: don't "source", but say "." 2006-03-05 22:10:26 -08:00
t9001-send-email.sh send-email: do not barf when Term::ReadLine does not like your terminal 2006-07-03 19:04:46 -07:00
t9100-git-svn-basic.sh git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
t9101-git-svn-props.sh git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
t9102-git-svn-deep-rmdir.sh git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
t9103-git-svn-graft-branches.sh git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
t9104-git-svn-follow-parent.sh git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
t9105-git-svn-commit-diff.sh git-svn: migrate out of contrib 2006-07-06 17:02:47 -07:00
test-lib.sh Merge branch 'ml/trace' 2006-07-12 23:09:10 -07:00
test4012.png binary diff and apply: testsuite. 2006-05-06 00:15:54 -07:00

Core GIT Tests
==============

This directory holds many test scripts for core GIT tools.  The
first part of this short document describes how to run the tests
and read their output.

When fixing the tools or adding enhancements, you are strongly
encouraged to add tests in this directory to cover what you are
trying to fix or enhance.  The later part of this short document
describes how your test scripts should be organized.


Running Tests
-------------

The easiest way to run tests is to say "make".  This runs all
the tests.

    *** t0000-basic.sh ***
    *   ok 1: .git/objects should be empty after git-init-db in an empty repo.
    *   ok 2: .git/objects should have 256 subdirectories.
    *   ok 3: git-update-index without --add should fail adding.
    ...
    *   ok 23: no diff after checkout and git-update-index --refresh.
    * passed all 23 test(s)
    *** t0100-environment-names.sh ***
    *   ok 1: using old names should issue warnings.
    *   ok 2: using old names but having new names should not issue warnings.
    ...

Or you can run each test individually from command line, like
this:

    $ sh ./t3001-ls-files-killed.sh
    *   ok 1: git-update-index --add to add various paths.
    *   ok 2: git-ls-files -k to show killed files.
    *   ok 3: validate git-ls-files -k output.
    * passed all 3 test(s)

You can pass --verbose (or -v), --debug (or -d), and --immediate
(or -i) command line argument to the test.

--verbose::
	This makes the test more verbose.  Specifically, the
	command being run and their output if any are also
	output.

--debug::
	This may help the person who is developing a new test.
	It causes the command defined with test_debug to run.

--immediate::
	This causes the test to immediately exit upon the first
	failed test.


Naming Tests
------------

The test files are named as:

	tNNNN-commandname-details.sh

where N is a decimal digit.

First digit tells the family:

	0 - the absolute basics and global stuff
	1 - the basic commands concerning database
	2 - the basic commands concerning the working tree
	3 - the other basic commands (e.g. ls-files)
	4 - the diff commands
	5 - the pull and exporting commands
	6 - the revision tree commands (even e.g. merge-base)
	7 - the porcelainish commands concerning the working tree

Second digit tells the particular command we are testing.

Third digit (optionally) tells the particular switch or group of switches
we are testing.

If you create files under t/ directory (i.e. here) that is not
the top-level test script, never name the file to match the above
pattern.  The Makefile here considers all such files as the
top-level test script and tries to run all of them.  A care is
especially needed if you are creating a common test library
file, similar to test-lib.sh, because such a library file may
not be suitable for standalone execution.


Writing Tests
-------------

The test script is written as a shell script.  It should start
with the standard "#!/bin/sh" with copyright notices, and an
assignment to variable 'test_description', like this:

	#!/bin/sh
	#
	# Copyright (c) 2005 Junio C Hamano
	#

	test_description='xxx test (option --frotz)

	This test registers the following structure in the cache
	and tries to run git-ls-files with option --frotz.'


Source 'test-lib.sh'
--------------------

After assigning test_description, the test script should source
test-lib.sh like this:

	. ./test-lib.sh

This test harness library does the following things:

 - If the script is invoked with command line argument --help
   (or -h), it shows the test_description and exits.

 - Creates an empty test directory with an empty .git/objects
   database and chdir(2) into it.  This directory is 't/trash'
   if you must know, but I do not think you care.

 - Defines standard test helper functions for your scripts to
   use.  These functions are designed to make all scripts behave
   consistently when command line arguments --verbose (or -v),
   --debug (or -d), and --immediate (or -i) is given.


End with test_done
------------------

Your script will be a sequence of tests, using helper functions
from the test harness library.  At the end of the script, call
'test_done'.


Test harness library
--------------------

There are a handful helper functions defined in the test harness
library for your script to use.

 - test_expect_success <message> <script>

   This takes two strings as parameter, and evaluates the
   <script>.  If it yields success, test is considered
   successful.  <message> should state what it is testing.

   Example:

	test_expect_success \
	    'git-write-tree should be able to write an empty tree.' \
	    'tree=$(git-write-tree)'

 - test_expect_failure <message> <script>

   This is the opposite of test_expect_success.  If <script>
   yields success, test is considered a failure.

   Example:

	test_expect_failure \
	    'git-update-index without --add should fail adding.' \
	    'git-update-index should-be-empty'

 - test_debug <script>

   This takes a single argument, <script>, and evaluates it only
   when the test script is started with --debug command line
   argument.  This is primarily meant for use during the
   development of a new test script.

 - test_done

   Your test script must have test_done at the end.  Its purpose
   is to summarize successes and failures in the test script and
   exit with an appropriate error code.


Tips for Writing Tests
----------------------

As with any programming projects, existing programs are the best
source of the information.  However, do _not_ emulate
t0000-basic.sh when writing your tests.  The test is special in
that it tries to validate the very core of GIT.  For example, it
knows that there will be 256 subdirectories under .git/objects/,
and it knows that the object ID of an empty tree is a certain
40-byte string.  This is deliberately done so in t0000-basic.sh
because the things the very basic core test tries to achieve is
to serve as a basis for people who are changing the GIT internal
drastically.  For these people, after making certain changes,
not seeing failures from the basic test _is_ a failure.  And
such drastic changes to the core GIT that even changes these
otherwise supposedly stable object IDs should be accompanied by
an update to t0000-basic.sh.

However, other tests that simply rely on basic parts of the core
GIT working properly should not have that level of intimate
knowledge of the core GIT internals.  If all the test scripts
hardcoded the object IDs like t0000-basic.sh does, that defeats
the purpose of t0000-basic.sh, which is to isolate that level of
validation in one place.  Your test also ends up needing
updating when such a change to the internal happens, so do _not_
do it and leave the low level of validation to t0000-basic.sh.