Skip to content

Commit 9aa98ef

Browse files
jiangxingitster
authored andcommitted
Fix tests under GETTEXT_POISON on pack-object
Use the i18n-specific test functions in test scripts for pack-object. This issue was was introduced in v1.7.10.2-556-g46140: 46140 index-pack: use streaming interface for collision test on large blobs cf2ba pack-objects: use streaming interface for reading large loose blobs and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 76638d9 commit 9aa98ef

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

t/t5300-pack-object.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,11 @@ test_expect_success \
416416
test_expect_success \
417417
'make sure index-pack detects the SHA1 collision' \
418418
'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
419-
grep "SHA1 COLLISION FOUND" msg'
419+
test_i18ngrep "SHA1 COLLISION FOUND" msg'
420420

421421
test_expect_success \
422422
'make sure index-pack detects the SHA1 collision (large blobs)' \
423423
'test_must_fail git -c core.bigfilethreshold=1 index-pack -o bad.idx test-3.pack 2>msg &&
424-
grep "SHA1 COLLISION FOUND" msg'
424+
test_i18ngrep "SHA1 COLLISION FOUND" msg'
425425

426426
test_done

t/t5530-upload-pack-error.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
3535
printf "0032want %s\n00000009done\n0000" \
3636
$(git rev-parse HEAD) >input &&
3737
test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
38-
grep "unable to read" output.err &&
39-
grep "pack-objects died" output.err
38+
test_i18ngrep "unable to read" output.err &&
39+
test_i18ngrep "pack-objects died" output.err
4040
'
4141

4242
test_expect_success 'corrupt repo differently' '

0 commit comments

Comments
 (0)