aboutsummaryrefslogtreecommitdiff
path: root/tests/t0020-validate-cache.sh
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'tests/t0020-validate-cache.sh')
-rwxr-xr-xtests/t0020-validate-cache.sh41
1 files changed, 15 insertions, 26 deletions
diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.sh
index 657765d..53ec2eb 100755
--- a/tests/t0020-validate-cache.sh
+++ b/tests/t0020-validate-cache.sh
@@ -1,13 +1,13 @@
#!/bin/sh
-test_description='Validate cache'
. ./setup.sh
-test_expect_success 'verify cache-size=0' '
+prepare_tests 'Validate cache'
- rm -f cache/* &&
- sed -e "s/cache-size=1021$/cache-size=0/" cgitrc >cgitrc.tmp &&
- mv -f cgitrc.tmp cgitrc &&
+run_test 'verify cache-size=0' '
+
+ rm -f trash/cache/* &&
+ sed -i -e "s/cache-size=1021$/cache-size=0/" trash/cgitrc &&
cgit_url "" &&
cgit_url "foo" &&
cgit_url "foo/refs" &&
@@ -21,15 +21,13 @@ test_expect_success 'verify cache-size=0' '
cgit_url "bar/log" &&
cgit_url "bar/diff" &&
cgit_url "bar/patch" &&
- ls cache >output &&
- test_line_count = 0 output
+ test 0 -eq $(ls trash/cache | wc -l)
'
-test_expect_success 'verify cache-size=1' '
+run_test 'verify cache-size=1' '
- rm -f cache/* &&
- sed -e "s/cache-size=0$/cache-size=1/" cgitrc >cgitrc.tmp &&
- mv -f cgitrc.tmp cgitrc &&
+ rm -f trash/cache/* &&
+ sed -i -e "s/cache-size=0$/cache-size=1/" trash/cgitrc &&
cgit_url "" &&
cgit_url "foo" &&
cgit_url "foo/refs" &&
@@ -43,15 +41,13 @@ test_expect_success 'verify cache-size=1' '
cgit_url "bar/log" &&
cgit_url "bar/diff" &&
cgit_url "bar/patch" &&
- ls cache >output &&
- test_line_count = 1 output
+ test 1 -eq $(ls trash/cache | wc -l)
'
-test_expect_success 'verify cache-size=1021' '
+run_test 'verify cache-size=1021' '
- rm -f cache/* &&
- sed -e "s/cache-size=1$/cache-size=1021/" cgitrc >cgitrc.tmp &&
- mv -f cgitrc.tmp cgitrc &&
+ rm -f trash/cache/* &&
+ sed -i -e "s/cache-size=1$/cache-size=1021/" trash/cgitrc &&
cgit_url "" &&
cgit_url "foo" &&
cgit_url "foo/refs" &&
@@ -65,14 +61,7 @@ test_expect_success 'verify cache-size=1021' '
cgit_url "bar/log" &&
cgit_url "bar/diff" &&
cgit_url "bar/patch" &&
- ls cache >output &&
- test_line_count = 13 output &&
- cgit_url "foo/ls_cache" >output.full &&
- strip_headers <output.full >output &&
- test_line_count = 13 output &&
- # Check that ls_cache output is cached correctly
- cgit_url "foo/ls_cache" >output.second &&
- test_cmp output.full output.second
+ test 13 -eq $(ls trash/cache | wc -l)
'
-test_done
+tests_done