From: Kirill Smelkov Date: Mon, 20 Sep 2010 20:39:44 GMT Subject: [PATCH v2 1/3] tests: Prepare --textconv tests for correctly-failing conversion program Message-ID: <6b2704af93283143d7756a1fa0fd52411e689292.1285013802.git.kirr@landau.phys.spbu.ru> In-Reply-To: (Description by Matthieu Moy) The textconv filter is sometimes incorrectly ran on a temporary file whose content is the target of a symbolic link, instead of actual file content. Prepare to test this by marking the content of the file to convert with "bin:", and let the helper die if "bin:" is not found in the file content. Cc: Axel Bonnet Cc: Clément Poulain Cc: Diane Gasselin Cc: Matthieu Moy Cc: Jeff King Signed-off-by: Kirill Smelkov --- v2: o Changed patch description as suggested by Matthieu t/t4042-diff-textconv-caching.sh | 25 +++++++++++++------------ t/t8006-blame-textconv.sh | 15 ++++++++------- t/t8007-cat-file-textconv.sh | 11 ++++++----- 3 files changed, 27 insertions(+), 24 deletions(-) diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff-textconv-caching.sh index 91f8198..7668099 100755 --- a/t/t4042-diff-textconv-caching.sh +++ b/t/t4042-diff-textconv-caching.sh @@ -5,18 +5,19 @@ test_description='test textconv caching' cat >helper <<'EOF' #!/bin/sh -sed 's/^/converted: /' "$@" >helper.out +grep -q '^bin: ' "$@" || { echo "E: $@ is not \"binary\" file" 1>&2; exit 1; } +sed 's/^bin:/converted:/' "$@" >helper.out cat helper.out EOF chmod +x helper test_expect_success 'setup' ' - echo foo content 1 >foo.bin && - echo bar content 1 >bar.bin && + echo "bin: foo content 1" >foo.bin && + echo "bin: bar content 1" >bar.bin && git add . && git commit -m one && - echo foo content 2 >foo.bin && - echo bar content 2 >bar.bin && + echo "bin: foo content 2" >foo.bin && + echo "bin: bar content 2" >bar.bin && git commit -a -m two && echo "*.bin diff=magic" >.gitattributes && git config diff.magic.textconv ./helper && @@ -25,14 +26,14 @@ test_expect_success 'setup' ' cat >expect <expect <other && + echo "bin: other" >other && git config diff.magic.textconv "./helper other" && git diff HEAD^ HEAD >actual && test_cmp expect actual @@ -84,7 +85,7 @@ test_expect_success 'changing textconv invalidates cache' ' cat >expect <helper <<'EOF' #!/bin/sh -sed 's/^/converted: /' "$@" +grep -q '^bin: ' "$@" || { echo "E: $@ is not \"binary\" file" 1>&2; exit 1; } +sed 's/^bin:/converted:/' "$@" EOF chmod +x helper test_expect_success 'setup ' ' - echo test 1 >one.bin && - echo test number 2 >two.bin && + echo "bin: test 1" >one.bin && + echo "bin: test number 2" >two.bin && git add . && GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" && - echo test 1 version 2 >one.bin && - echo test number 2 version 2 >>two.bin && + echo "bin: test 1 version 2" >one.bin && + echo "bin: test number 2 version 2" >>two.bin && GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" ' cat >expected <>two.bin && + echo "bin: test number 2 version 3" >>two.bin && GIT_AUTHOR_NAME=Number3 git commit -a -m Third --date="2010-01-01 22:00:00" ' diff --git a/t/t8007-cat-file-textconv.sh b/t/t8007-cat-file-textconv.sh index 38ac05e..413d623 100755 --- a/t/t8007-cat-file-textconv.sh +++ b/t/t8007-cat-file-textconv.sh @@ -5,15 +5,16 @@ test_description='git cat-file textconv support' cat >helper <<'EOF' #!/bin/sh -sed 's/^/converted: /' "$@" +grep -q '^bin: ' "$@" || { echo "E: $@ is not \"binary\" file" 1>&2; exit 1; } +sed 's/^bin:/converted:/' "$@" EOF chmod +x helper test_expect_success 'setup ' ' - echo test >one.bin && + echo "bin: test" >one.bin && git add . && GIT_AUTHOR_NAME=Number1 git commit -a -m First --date="2010-01-01 18:00:00" && - echo test version 2 >one.bin && + echo "bin: test version 2" >one.bin && GIT_AUTHOR_NAME=Number2 git commit -a -m Second --date="2010-01-01 20:00:00" ' @@ -33,7 +34,7 @@ test_expect_success 'setup textconv filters' ' ' cat >expected <expected <