git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Johannes Sixt <j6t@kdbg.org>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH v5] Test fsck a bit harder
Date: Sun,  1 Mar 2009 23:32:43 +0100	[thread overview]
Message-ID: <1235946763-15252-1-git-send-email-trast@student.ethz.ch> (raw)
In-Reply-To: <200902212021.37807.j6t@kdbg.org>

git-fsck, of all tools, has very few tests.  This adds some more:
* a corrupted object;
* a branch pointing to a non-commit;
* a tag pointing to a nonexistent object;
* and a tag pointing to an object of a type other than what the tag
  itself claims.

Some of the involved shell programming is due to Johannes Sixt.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---

Sorry for taking so long to fix this.

Johannes Sixt wrote:
> This is wrong: It does not test the exist status. In a pipeline, the shell 
> looks only at the exit status of the last command. You really want this as
> 
>  	test_must_fail git fsck >out 2>&1 &&

You're right.

> If you want to have it more verbose, add 'cat out &&'. But IMHO that is 
> overengineered. If the test detects a regression in the future, it is easy to 
> inspect the file out if necessary.

I usually try to write the tests such that the cause of failure should
be reasonably obvious from the verbose output.  But I don't really
care enough to insert stray cats either...


 t/t1450-fsck.sh |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 4597af0..d4a83a1 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -28,4 +28,73 @@ test_expect_success 'loose objects borrowed from alternate are not missing' '
 	)
 '
 
+# Corruption tests follow.  Make sure to remove all traces of the
+# specific corruption you test afterwards, lest a later test trip over
+# it.
+
+test_expect_success 'object with bad sha1' '
+	sha=$(echo blob | git hash-object -w --stdin) &&
+	echo $sha &&
+	old=$(echo $sha | sed "s+^..+&/+") &&
+	new=${old%/*}/ffffffffffffffffffffffffffffffffffffff &&
+	sha=${new%/*}${new##*/} &&
+	mv .git/objects/$old .git/objects/$new &&
+	git update-index --add --cacheinfo 100644 $sha foo &&
+	tree=$(git write-tree) &&
+	cmt=$(echo bogus | git commit-tree $tree) &&
+	git update-ref refs/heads/bogus $cmt &&
+	test_must_fail git fsck >out 2>&1 &&
+	grep "$sha.*corrupt" out
+'
+
+rm -f .git/objects/$new
+git update-ref -d refs/heads/bogus
+git read-tree -u --reset HEAD
+
+test_expect_success 'branch pointing to non-commit' '
+	git rev-parse HEAD^{tree} > .git/refs/heads/invalid &&
+	git fsck 2>&1 | tee out &&
+	grep "not a commit" out
+'
+
+git update-ref -d refs/heads/invalid
+
+cat > invalid-tag <<EOF
+object ffffffffffffffffffffffffffffffffffffffff
+type commit
+tag invalid
+tagger T A Gger <tagger@example.com> 1234567890 -0000
+
+This is an invalid tag.
+EOF
+
+test_expect_success 'tag pointing to nonexistent' '
+	tag=$(git hash-object -t tag -w --stdin < invalid-tag) &&
+	echo $tag > .git/refs/tags/invalid &&
+	test_must_fail git fsck >out 2>&1 &&
+	grep "missing commit ffffffffffffffffffffffffffffffffffffffff" out
+'
+
+rm .git/refs/tags/invalid
+rm -f .git/objects/$(echo $tag | sed "s#^..#&/#")
+
+cat > wrong-tag <<EOF
+object $(echo blob | git hash-object -w --stdin)
+type commit
+tag wrong
+tagger T A Gger <tagger@example.com> 1234567890 -0000
+
+This is an invalid tag.
+EOF
+
+test_expect_success 'tag pointing to something else than its type' '
+	tag=$(git hash-object -t tag -w --stdin < wrong-tag) &&
+	echo $tag > .git/refs/tags/wrong &&
+	test_must_fail git fsck >out 2>&1 &&
+	grep "Object.*is a blob, not a commit" out
+'
+
+rm .git/refs/tags/wrong
+
+
 test_done
-- 
1.6.2.rc2.289.g2fa25

  reply	other threads:[~2009-03-01 22:34 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-19  1:42 What's cooking in git.git (Feb 2009, #06; Wed, 18) Junio C Hamano
2009-02-19 11:13 ` [PATCH v2 0/8] Support coverage testing with GCC/gcov Thomas Rast
2009-02-19 11:13   ` [PATCH v2 1/8] " Thomas Rast
2009-02-19 11:13   ` [PATCH v2 2/8] Test that diff can read from stdin Thomas Rast
2009-02-19 11:13   ` [PATCH v2 3/8] Test diff --dirstat functionality Thomas Rast
2009-02-19 11:13   ` [PATCH v2 4/8] Test log --graph Thomas Rast
2009-02-19 11:13   ` [PATCH v2 5/8] Test fsck a bit harder Thomas Rast
2009-02-20 19:40     ` [PATCH v3] " Thomas Rast
2009-02-20 20:29       ` Johannes Sixt
2009-02-21 11:25         ` [PATCH v4] " Thomas Rast
2009-02-21 19:21           ` Johannes Sixt
2009-03-01 22:32             ` Thomas Rast [this message]
2009-03-03  7:31               ` [PATCH v5] " Junio C Hamano
2009-02-19 11:13   ` [PATCH v2 6/8] Test log --decorate Thomas Rast
2009-02-19 11:13   ` [PATCH v2 7/8] Test rev-list --parents/--children Thomas Rast
2009-02-19 11:13   ` [PATCH v2 8/8] Test git-patch-id Thomas Rast
2009-02-19 13:46   ` [PATCH v2 0/8] Support coverage testing with GCC/gcov Johannes Schindelin
2009-02-19 14:11     ` Thomas Rast
2009-02-19 14:09   ` Sverre Rabbelier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1235946763-15252-1-git-send-email-trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).