t1450: check large blob in trailing-garbage test

peff · gitster · commit 5632baf238c0 · 2018-10-31T12:53:44.000+09:00
Commit cce044d (fsck: detect trailing garbage in all object types, 2017-01-13) added two tests of trailing garbage in a loose object file: one with a commit and one with a blob. The point of having two is that blobs would follow a different code path that streamed the contents, instead of loading it into a buffer as usual. At the time, merely being a blob was enough to trigger the streaming code path. But since 7ac4f3a (fsck: actually fsck blob data, 2018-05-02), we now only stream blobs that are actually large. So since then, the streaming code path is not tested at all for this case. We can restore the original intent of the test by tweaking core.bigFileThreshold to make our small blob seem large. There's no easy way to externally verify that we followed the streaming code path, but I did check before/after using a temporary debug statement. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
@@ -636,13 +636,13 @@ test_expect_success 'fsck detects trailing loose garbage (commit)' '
 	test_i18ngrep "garbage.*$commit" out
 '
 
-test_expect_success 'fsck detects trailing loose garbage (blob)' '
+test_expect_success 'fsck detects trailing loose garbage (large blob)' '
 	blob=$(echo trailing | git hash-object -w --stdin) &&
 	file=$(sha1_file $blob) &&
 	test_when_finished "remove_object $blob" &&
 	chmod +w "$file" &&
 	echo garbage >>"$file" &&
-	test_must_fail git fsck 2>out &&
+	test_must_fail git -c core.bigfilethreshold=5 fsck 2>out &&
 	test_i18ngrep "garbage.*$blob" out
 '
 

Original file line number	Diff line number	Diff line change
`@@ -636,13 +636,13 @@ test_expect_success 'fsck detects trailing loose garbage (commit)' '`
`636`	`636`	`test_i18ngrep "garbage.*$commit" out`
`637`	`637`	`'`
`638`	`638`
`639`		`-test_expect_success 'fsck detects trailing loose garbage (blob)' '`
	`639`	`+test_expect_success 'fsck detects trailing loose garbage (large blob)' '`
`640`	`640`	`blob=$(echo trailing \| git hash-object -w --stdin) &&`
`641`	`641`	`file=$(sha1_file $blob) &&`
`642`	`642`	`test_when_finished "remove_object $blob" &&`
`643`	`643`	`chmod +w "$file" &&`
`644`	`644`	`echo garbage >>"$file" &&`
`645`		`- test_must_fail git fsck 2>out &&`
	`645`	`+ test_must_fail git -c core.bigfilethreshold=5 fsck 2>out &&`
`646`	`646`	`test_i18ngrep "garbage.*$blob" out`
`647`	`647`	`'`
`648`	`648`