mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests under GETTEXT_POISON on pack-object

Browse Source 
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>
This commit is contained in:
Jiang Xin
2012-08-27 13:36:53 +08:00
committed by Junio C Hamano
parent 76638d90e8
commit 9aa98efca2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t5300-pack-object.sh
View File

@ -416,11 +416,11 @@ test_expect_success \
test_expect_success \ test_expect_success \
'make sure index-pack detects the SHA1 collision' \ 'make sure index-pack detects the SHA1 collision' \
'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg && 'test_must_fail git index-pack -o bad.idx test-3.pack 2>msg &&
grep "SHA1 COLLISION FOUND" msg' test_i18ngrep "SHA1 COLLISION FOUND" msg'
test_expect_success \ test_expect_success \
'make sure index-pack detects the SHA1 collision (large blobs)' \ 'make sure index-pack detects the SHA1 collision (large blobs)' \
'test_must_fail git -c core.bigfilethreshold=1 index-pack -o bad.idx test-3.pack 2>msg && 'test_must_fail git -c core.bigfilethreshold=1 index-pack -o bad.idx test-3.pack 2>msg &&
grep "SHA1 COLLISION FOUND" msg' test_i18ngrep "SHA1 COLLISION FOUND" msg'
test_done test_done

4
t/t5530-upload-pack-error.sh
View File

@ -35,8 +35,8 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' '
printf "0032want %s\n00000009done\n0000" \ printf "0032want %s\n00000009done\n0000" \
$(git rev-parse HEAD) >input && $(git rev-parse HEAD) >input &&
test_must_fail git upload-pack . <input >/dev/null 2>output.err && test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
grep "unable to read" output.err && test_i18ngrep "unable to read" output.err &&
grep "pack-objects died" output.err test_i18ngrep "pack-objects died" output.err
' '
test_expect_success 'corrupt repo differently' ' test_expect_success 'corrupt repo differently' '