Re: [PATCH] t5540-http-test: shorten grep pattern

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 29, 2011, 05:17 UTC
Message-ID: <7vhb5094pm.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1314506520-17430-1-git-send-email-brian@gernhardtsoftware.com>

Brian Gernhardt <brian@gernhardtsoftware.com> writes:

Show 28 quoted lines

> On OS X, the grep pattern
>
>     "\"OP .*/objects/$x2/X38_X40 HTTP/[.0-9]*\" 20[0-9] "
>
> is far too long ($x38 and $x40 represent 38 and 40 copies of
> [0-9a-f]).  In order to still be able to match this, use the sed
> invocation to replace what we're looking for a token.
>
> Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
> ---
>  t/t5540-http-push.sh |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh
> index a266ca5..5bf287d 100755
> --- a/t/t5540-http-push.sh
> +++ b/t/t5540-http-push.sh
> @@ -132,8 +132,9 @@ x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
>  x40="$x38$x2"
>  
>  test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
> -	sed -e "s/PUT /OP /" -e "s/MOVE /OP /" "$HTTPD_ROOT_PATH"/access.log |
> -	grep -e "\"OP .*/objects/$x2/${x38}_$x40 HTTP/[.0-9]*\" 20[0-9] "
> +	sed -e "s/PUT /OP /" -e "s/MOVE /OP /" -e "s/$x40/X40/" -e "s/$x38/X38/"\
> +		"$HTTPD_ROOT_PATH"/access.log |
> +	grep -e "\"OP .*/objects/$x2/X38_X40 HTTP/[.0-9]*\" 20[0-9] "
>  
>  '

Hmm...

Is it sensible to replace $x40 with X40 and $x38 with X38 on any line anywhere for the purpose of this test? As the downstream test is only interested in a line with HTTP request line that asks for a specific path under objects/??/?{38}_?{40}, wouldn't it make more sense to replace occurrences of only such line?

	sed -n \
            -e "s/PUT /OP " \
	    -e "s/MOVE /OP /" \
	    -e "s|/objects/$x2/$x38_$x40|WANTED_PATH_REQUEST|p" \
	    "$HTTPD_ROOT_PATH/access.log" |
	grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] "