git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH v2 5/8] Test fsck a bit harder
Date: Thu, 19 Feb 2009 12:13:39 +0100	[thread overview]
Message-ID: <0599d1b4fe0f243b3d86d9afd9c67858861838aa.1235041345.git.trast@student.ethz.ch> (raw)
In-Reply-To: <cover.1235041345.git.trast@student.ethz.ch>

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.

Only the first two are caught.  At least the third probably should,
too, but currently slips through.

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

Fixed a missing --stdin when calling git-hash-object.  I also added
some debugging 'cat out' to make it easier to fix the 'grep'
invocation when fsck actually starts printing errors for these
corruptions.

   --- a/t/t1450-fsck.sh
   +++ b/t/t1450-fsck.sh
  -@@ -28,4 +28,69 @@ test_expect_success 'loose objects borrowed from alternate are not missing' '
  +@@ -28,4 +28,71 @@ test_expect_success 'loose objects borrowed from alternate are not missing' '
          )
    '

  @@ -79,12 +80,13 @@
   +      tag=$(git hash-object -w --stdin < invalid-tag) &&
   +      echo $tag > .git/refs/tags/invalid &&
   +      git fsck --tags 2>out &&
  ++      cat out &&
   +      grep "could not load tagged object" out &&
   +      rm .git/refs/tags/invalid
   +'
   +
   +cat > wrong-tag <<EOF
  -+object $(echo blob | git hash-object -w)
  ++object $(echo blob | git hash-object -w --stdin)
   +type commit
   +tag wrong
   +tagger T A Gger <tagger@example.com> 1234567890 -0000
  @@ -96,6 +98,7 @@
   +      tag=$(git hash-object -w --stdin < wrong-tag) &&
   +      echo $tag > .git/refs/tags/wrong &&
   +      git fsck --tags 2>out &&
  ++      cat out &&
   +      grep "some sane error message" out &&
   +      rm .git/refs/tags/wrong
   +'


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

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 4597af0..a22632f 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -28,4 +28,71 @@ 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=$(dirname $old)/ffffffffffffffffffffffffffffffffffffff &&
+	sha="$(dirname $new)$(basename $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 &&
+	(git fsck 2>out; true) &&
+	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>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_failure 'tag pointing to nonexistent' '
+	tag=$(git hash-object -w --stdin < invalid-tag) &&
+	echo $tag > .git/refs/tags/invalid &&
+	git fsck --tags 2>out &&
+	cat out &&
+	grep "could not load tagged object" out &&
+	rm .git/refs/tags/invalid
+'
+
+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_failure 'tag pointing to something else than its type' '
+	tag=$(git hash-object -w --stdin < wrong-tag) &&
+	echo $tag > .git/refs/tags/wrong &&
+	git fsck --tags 2>out &&
+	cat out &&
+	grep "some sane error message" out &&
+	rm .git/refs/tags/wrong
+'
+
+
+
 test_done
-- 
1.6.2.rc1.266.gce6c4

  parent reply	other threads:[~2009-02-19 11:16 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   ` Thomas Rast [this message]
2009-02-20 19:40     ` [PATCH v3] Test fsck a bit harder 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             ` [PATCH v5] " Thomas Rast
2009-03-03  7:31               ` 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=0599d1b4fe0f243b3d86d9afd9c67858861838aa.1235041345.git.trast@student.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).