[4/8] t5503: fix overspecification of trace expectation

Message ID	8f510c5c78dd5152307e30f8115188ad689b8c57.1551131153.git.jonathantanmy@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Mon, 25 Feb 2019 13:54:09 -0800 In-Reply-To: <cover.1551131153.git.jonathantanmy@google.com> Message-Id: <8f510c5c78dd5152307e30f8115188ad689b8c57.1551131153.git.jonathantanmy@google.com> Mime-Version: 1.0 References: <cover.1551131153.git.jonathantanmy@google.com> Subject: [PATCH 4/8] t5503: fix overspecification of trace expectation From: Jonathan Tan <jonathantanmy@google.com> To: git@vger.kernel.org Cc: Jonathan Tan <jonathantanmy@google.com>, peff@peff.net, Junio C Hamano <gitster@pobox.com> Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk
Series	GIT_TEST_PROTOCOL_VERSION, this time on master \| expand [0/8] GIT_TEST_PROTOCOL_VERSION, this time on master [1/8] tests: define GIT_TEST_PROTOCOL_VERSION [2/8] t5601: check ssh command only with protocol v0 [3/8] tests: always test fetch of unreachable with v0 [4/8] t5503: fix overspecification of trace expectation [5/8] t5512: compensate for v0 only sending HEAD symrefs [6/8] t5700: only run with protocol version 1 [7/8] tests: fix protocol version for overspecifications [8/8] t5552: compensate for v2 filtering ref adv.

Message ID

8f510c5c78dd5152307e30f8115188ad689b8c57.1551131153.git.jonathantanmy@google.com (mailing list archive)

State

New, archived

Headers

Date: Mon, 25 Feb 2019 13:54:09 -0800
In-Reply-To: <cover.1551131153.git.jonathantanmy@google.com>
Message-Id: 
 <8f510c5c78dd5152307e30f8115188ad689b8c57.1551131153.git.jonathantanmy@google.com>
Mime-Version: 1.0
References: <cover.1551131153.git.jonathantanmy@google.com>
Subject: [PATCH 4/8] t5503: fix overspecification of trace expectation
From: Jonathan Tan <jonathantanmy@google.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>, peff@peff.net,
        Junio C Hamano <gitster@pobox.com>
Content-Type: text/plain; charset="UTF-8"
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

GIT_TEST_PROTOCOL_VERSION, this time on master | expand

Commit Message

Jonathan Tan Feb. 25, 2019, 9:54 p.m. UTC

In order to extract the wants from a trace, a loop in t5503 currently
breaks if "0000" is found. This works for protocol v0 and v1, but not
v2. Instead, teach t5503 to look specifically for the "want" string,
which is compatible with all protocols.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t5503-tagfollow.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index 4ca48f0276..6041a4dd32 100755
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -47,7 +47,7 @@  get_needs () {
 	test -s "$1" &&
 	perl -alne '
 		next unless $F[1] eq "upload-pack<";
-		last if $F[2] eq "0000";
+		next unless $F[2] eq "want";
 		print $F[2], " ", $F[3];
 	' "$1"
 }

[4/8] t5503: fix overspecification of trace expectation

Commit Message

Patch