Merge branch 'jk/t5319-midx-corruption-test-deflake'

gitster · gitster · commit b0b5337876c4 · 2021-12-10T14:35:08.000-08:00
Test fix.

* jk/t5319-midx-corruption-test-deflake:
  t5319: corrupt more bytes of the midx checksum
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
@@ -482,8 +482,10 @@ test_expect_success 'corrupt MIDX is not reused' '
 '
 
 test_expect_success 'verify incorrect checksum' '
-	pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 1)) &&
-	corrupt_midx_and_verify $pos "\377" $objdir "incorrect checksum"
+	pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 10)) &&
+	corrupt_midx_and_verify $pos \
+		"\377\377\377\377\377\377\377\377\377\377" \
+		$objdir "incorrect checksum"
 '
 
 test_expect_success 'repack progress off for redirected stderr' '

Original file line number	Diff line number	Diff line change
`@@ -482,8 +482,10 @@ test_expect_success 'corrupt MIDX is not reused' '`
`482`	`482`	`'`
`483`	`483`
`484`	`484`	`test_expect_success 'verify incorrect checksum' '`
`485`		`- pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 1)) &&`
`486`		`- corrupt_midx_and_verify $pos "\377" $objdir "incorrect checksum"`
	`485`	`+ pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 10)) &&`
	`486`	`+ corrupt_midx_and_verify $pos \`
	`487`	`+ "\377\377\377\377\377\377\377\377\377\377" \`
	`488`	`+ $objdir "incorrect checksum"`
`487`	`489`	`'`
`488`	`490`
`489`	`491`	`test_expect_success 'repack progress off for redirected stderr' '`