[PATCH 1/2] tests: introduce strip_header() helper function

[John Keeping]

On Sat, May 18, 2013 at 06:46:38PM +0100, John Keeping wrote:
> This means that we can avoid hardcoding the number of headers we expect
> CGit to generate in test cases and simply remove whatever headers happen
> to by there when we are checking body content.
> 
> Signed-off-by: John Keeping <john at keeping.me.uk>
> ---
> This was previously sent with a different command message and
> justification[1] but wasn't picked up.  I still think this is a useful
> function to have in the test suite and it's used by patch 2/2 here.

Should have included the reference here...

[1] http://article.gmane.org/gmane.comp.version-control.cgit/1349

>  tests/setup.sh          | 8 ++++++++
>  tests/t0107-snapshot.sh | 4 ++--
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/setup.sh b/tests/setup.sh
> index a573444..1d8677a 100755
> --- a/tests/setup.sh
> +++ b/tests/setup.sh
> @@ -98,4 +98,12 @@ cgit_url()
>  	CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit
>  }
>  
> +strip_headers () {
> +	while read -r line
> +	do
> +		test -z "$line" && break
> +	done
> +	cat
> +}
> +
>  test -z "$CGIT_TEST_NO_CREATE_REPOS" && setup_repos
> diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
> index 053062c..6cf7aaa 100755
> --- a/tests/t0107-snapshot.sh
> +++ b/tests/t0107-snapshot.sh
> @@ -16,7 +16,7 @@ test_expect_success 'check html headers' '
>  '
>  
>  test_expect_success 'strip off the header lines' '
> -	tail -n +6 tmp > master.tar.gz
> +	strip_headers <tmp >master.tar.gz
>  '
>  
>  test_expect_success 'verify gzip format' '
> @@ -51,7 +51,7 @@ test_expect_success 'check HTML headers (zip)' '
>  '
>  
>  test_expect_success 'strip off the header lines (zip)' '
> -	tail -n +6 tmp >master.zip
> +	strip_headers <tmp >master.zip
>  '
>  
>  if test -n "$(which unzip 2>/dev/null)"; then
> -- 
> 1.8.3.rc2.285.gfc18c2c
>