By introducing a strip_headers() helper function, we can avoid relying on the number of HTTP headers generated by CGit being fixed.
This function will also be useful for performing more rigid checks on HTML body content. Signed-off-by: John Keeping <[email protected]> --- This is also useful for some test suite improvements I'm working on. I'll send an RFC for that shortly. 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.rc0.149.g98a72f2.dirty _______________________________________________ cgit mailing list [email protected] http://hjemli.net/mailman/listinfo/cgit
