tests: introduce strip_header() helper function

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@keeping.me.uk>
upstream
John Keeping 12 years ago committed by Jason A. Donenfeld
parent 1e9f1ee64e
commit 75bfec6448
  1. 8
      tests/setup.sh
  2. 4
      tests/t0107-snapshot.sh

@ -98,4 +98,12 @@ cgit_url()
CGIT_CONFIG="$PWD/cgitrc" QUERY_STRING="url=$1" cgit 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 test -z "$CGIT_TEST_NO_CREATE_REPOS" && setup_repos

@ -16,7 +16,7 @@ test_expect_success 'check html headers' '
' '
test_expect_success 'strip off the header lines' ' 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' ' 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)' ' 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 if test -n "$(which unzip 2>/dev/null)"; then

Loading…
Cancel
Save