[PATCH 2/7] t5530: check protocol response for "not our ref"
- From
Jeff King <peff@peff.net>
- Date
- Apr 13, 2019, 05:53 UTC
- Message-ID
- <20190413055309.GB19495@sigill.intra.peff.net>
- In-Reply-To
- <20190413055127.GA32340@sigill.intra.peff.net>
Back in 9f9aa76130 (upload-pack: Improve error message when bad ref requested, 2010-07-31), we added a test to make sure that we die with a sensible message when the client asks for an object we don't have.
Much later, in bdb31eada7 (upload-pack: report "not our ref" to client, 2017-02-23), we started reporting that information via an "ERR" line in the protocol. Let's check that part, as well.
While we're touching this test, let's drop the "-q" on the grep calls. Our usual test style just relies on --verbose to control output.
Signed-off-by: Jeff King <peff@peff.net> --- If like me, you are scratching your head over the grep for multi_ack_detailed, it is from 9f9aa76130, which made sure we did not spew extra cruft as part of the die message.
t/t5530-upload-pack-error.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index 4f6e32b04c..295bd0c83c 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -62,8 +62,9 @@ test_expect_success 'upload-pack error message when bad ref requested' ' printf "0045want %s multi_ack_detailed\n00000009done\n0000" \ "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input && test_must_fail git upload-pack . <input >output 2>output.err && - grep -q "not our ref" output.err && - ! grep -q multi_ack_detailed output.err + grep "not our ref" output.err && + grep "ERR" output && + ! grep multi_ack_detailed output.err ' test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
-- 2.21.0.931.gd0bc72a411