tests: introduce strip_header() helper function

[ps-cgit] / tests / t0107-snapshot.sh

diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index 4fbe45edd34ded4333ab281461240a29a612acaf..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' '
@@ -25,7 +25,7 @@ test_expect_success 'verify gzip format' '
 
 test_expect_success 'untar' '
        rm -rf master &&
-       tar -xf master.tar.gz
+       tar -xzf master.tar.gz
 '
 
 test_expect_success 'count files' '
@@ -51,24 +51,30 @@ 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
 '
 
-test_expect_success 'verify zip format' '
+if test -n "$(which unzip 2>/dev/null)"; then
+       test_set_prereq UNZIP
+else
+       say 'Skipping ZIP validation tests: unzip not found'
+fi
+
+test_expect_success UNZIP 'verify zip format' '
        unzip -t master.zip
 '
 
-test_expect_success 'unzip' '
+test_expect_success UNZIP 'unzip' '
        rm -rf master &&
        unzip master.zip
 '
 
-test_expect_success 'count files (zip)' '
+test_expect_success UNZIP 'count files (zip)' '
        ls master/ >output &&
        test_line_count = 5 output
 '
 
-test_expect_success 'verify unzipped file-5' '
+test_expect_success UNZIP 'verify unzipped file-5' '
        grep "^5$" master/file-5 &&
        test_line_count = 1 master/file-5
 '