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>

diff --git a/tests/setup.sh b/tests/setup.sh
index a573444583dc998c597708f5ec86aab9d5fe4bbf..1d8677a783ec5d5b877a8d2a259c88d36b96ff14 100755 (executable)
--- 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 053062c27504cada28d72e5d4ee517357c0f6e0a..6cf7aaa6fca5dd8d9c48fca1a4f988db31aff539 100755 (executable)
--- 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