@@ -14,9 +14,12 @@ test_expect_success 'extra delim packet in v2 ls-refs args' '
# protocol expects 0000 flush here
printf 0001
} >input &&
+ cat >err.expect <<-\EOF &&
+ fatal: expected flush after ls-refs arguments
+ EOF
test_must_fail env GIT_PROTOCOL=version=2 \
- git upload-pack . <input 2>err &&
- test_i18ngrep "expected flush after ls-refs arguments" err
+ git upload-pack . <input 2>err.actual &&
+ test_cmp err.expect err.actual
'
test_expect_success 'extra delim packet in v2 fetch args' '
@@ -27,9 +30,12 @@ test_expect_success 'extra delim packet in v2 fetch args' '
# protocol expects 0000 flush here
printf 0001
} >input &&
+ cat >err.expect <<-\EOF &&
+ fatal: expected flush after fetch arguments
+ EOF
test_must_fail env GIT_PROTOCOL=version=2 \
- git upload-pack . <input 2>err &&
- test_i18ngrep "expected flush after fetch arguments" err
+ git upload-pack . <input 2>err.actual &&
+ test_cmp err.expect err.actual
'
test_expect_success 'extra delim packet in v2 object-info args' '
Amend the protocol violations tests to check the full output, not just grep it. This changes code added in 4845b772458 (upload-pack: handle unexpected delim packets, 2020-03-27). The newly added test in the preceding commit already did the full test_cmp. I have a related series to tweak the output from upload-pack et al, we really want to make sure we have this exact output, and not fewer or more lines etc. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t5704-protocol-violations.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)