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 <worldhello.net@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin committed
Aug 27, 2012 at 13:36 UTC
9aa98efca286f7e7795a30614d79f120d0cd786c
2 files changed
+4
-4
t/t5300-pack-object.sh
+2
-2
@@ -416,11 +416,11 @@ test_expect_success \
416
test_expect_success \
417
'make sure index-pack detects the SHA1 collision' \
418
'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'
420
421
test_expect_success \
422
'make sure index-pack detects the SHA1 collision (large blobs)' \
423
'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'
425
426
test_done
t/t5530-upload-pack-error.sh
+2
-2
@@ -35,8 +35,8 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
35
printf "0032want %s\n00000009done\n0000" \
36
$(git rev-parse HEAD) >input &&
37
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
40
'
41
42
test_expect_success 'corrupt repo differently' '