2 files changed, 68 insertions, 1 deletion

diff --git a/tests/setup.sh b/tests/setup.shindex 66bf406d..e37306ee 100755--- a/tests/setup.sh+++ b/tests/setup.sh@@ -44,7 +44,7 @@ setup_repos() virtual-root=/ cache-root=$PWD/trash/cache -nocache=0+cache-size=1021 snapshots=tar.gz tar.bz zip enable-log-filecount=1 enable-log-linecount=1
diff --git a/tests/setup.sh b/tests/setup.sh
index 66bf406d..e37306ee 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -44,7 +44,7 @@ setup_repos()
 virtual-root=/
 cache-root=$PWD/trash/cache
 
-nocache=0
+cache-size=1021
 snapshots=tar.gz tar.bz zip
 enable-log-filecount=1
 enable-log-linecount=1
diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.shnew file mode 100755index 00000000..53ec2eb0--- /dev/null+++ b/tests/t0020-validate-cache.sh@@ -0,0 +1,67 @@+#!/bin/sh++. ./setup.sh++prepare_tests 'Validate cache'++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" &&+	cgit_url "foo/tree" &&+	cgit_url "foo/log" &&+	cgit_url "foo/diff" &&+	cgit_url "foo/patch" &&+	cgit_url "bar" &&+	cgit_url "bar/refs" &&+	cgit_url "bar/tree" &&+	cgit_url "bar/log" &&+	cgit_url "bar/diff" &&+	cgit_url "bar/patch" &&+	test 0 -eq $(ls trash/cache | wc -l)+'++run_test 'verify cache-size=1' '++	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" &&+	cgit_url "foo/tree" &&+	cgit_url "foo/log" &&+	cgit_url "foo/diff" &&+	cgit_url "foo/patch" &&+	cgit_url "bar" &&+	cgit_url "bar/refs" &&+	cgit_url "bar/tree" &&+	cgit_url "bar/log" &&+	cgit_url "bar/diff" &&+	cgit_url "bar/patch" &&+	test 1 -eq $(ls trash/cache | wc -l)+'++run_test 'verify cache-size=1021' '++	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" &&+	cgit_url "foo/tree" &&+	cgit_url "foo/log" &&+	cgit_url "foo/diff" &&+	cgit_url "foo/patch" &&+	cgit_url "bar" &&+	cgit_url "bar/refs" &&+	cgit_url "bar/tree" &&+	cgit_url "bar/log" &&+	cgit_url "bar/diff" &&+	cgit_url "bar/patch" &&+	test 13 -eq $(ls trash/cache | wc -l)+'++tests_done
diff --git a/tests/t0020-validate-cache.sh b/tests/t0020-validate-cache.sh
new file mode 100755
index 00000000..53ec2eb0
--- /dev/null
+++ b/tests/t0020-validate-cache.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+. ./setup.sh
+
+prepare_tests 'Validate cache'
+
+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" &&
+	cgit_url "foo/tree" &&
+	cgit_url "foo/log" &&
+	cgit_url "foo/diff" &&
+	cgit_url "foo/patch" &&
+	cgit_url "bar" &&
+	cgit_url "bar/refs" &&
+	cgit_url "bar/tree" &&
+	cgit_url "bar/log" &&
+	cgit_url "bar/diff" &&
+	cgit_url "bar/patch" &&
+	test 0 -eq $(ls trash/cache | wc -l)
+'
+
+run_test 'verify cache-size=1' '
+
+	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" &&
+	cgit_url "foo/tree" &&
+	cgit_url "foo/log" &&
+	cgit_url "foo/diff" &&
+	cgit_url "foo/patch" &&
+	cgit_url "bar" &&
+	cgit_url "bar/refs" &&
+	cgit_url "bar/tree" &&
+	cgit_url "bar/log" &&
+	cgit_url "bar/diff" &&
+	cgit_url "bar/patch" &&
+	test 1 -eq $(ls trash/cache | wc -l)
+'
+
+run_test 'verify cache-size=1021' '
+
+	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" &&
+	cgit_url "foo/tree" &&
+	cgit_url "foo/log" &&
+	cgit_url "foo/diff" &&
+	cgit_url "foo/patch" &&
+	cgit_url "bar" &&
+	cgit_url "bar/refs" &&
+	cgit_url "bar/tree" &&
+	cgit_url "bar/log" &&
+	cgit_url "bar/diff" &&
+	cgit_url "bar/patch" &&
+	test 13 -eq $(ls trash/cache | wc -l)
+'
+
+tests_done