3 files changed, 10 insertions, 7 deletions
diff --git a/test/scripts/continuous-merge-start.sh b/test/scripts/continuous-merge-start.sh
index 666512f..5791d12 100755
--- a/test/scripts/continuous-merge-start.sh
+++ b/test/scripts/continuous-merge-start.sh
@@ -7,4 +7,4 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd)
 
 . ${top_srcdir}/test/scripts/testutils.sh
 
-do_merge --mergeinterval 30 --pidfile merge.pid
+do_merge --mergeinterval 10 --pidfile merge.pid
diff --git a/test/scripts/continuous-merge-test-run-1.sh b/test/scripts/continuous-merge-test-run-1.sh
index 537ff2f..1a1dae6 100755
--- a/test/scripts/continuous-merge-test-run-1.sh
+++ b/test/scripts/continuous-merge-test-run-1.sh
@@ -3,6 +3,8 @@
 set -o nounset
 set -o errexit
 
+SLEEP=40
+
 top_srcdir=$(cd $(dirname $0)/../..; pwd)
 
 . ${top_srcdir}/test/scripts/testutils.sh
@@ -15,8 +17,8 @@ for certfile in ${top_srcdir}/tools/testcerts/cert[1-5].txt ${top_srcdir}/tools/
     python ${top_srcdir}/tools/submitcert.py --parallel=1 --store $certfile --check-sct --sct-file=submittedcerts ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || fail "Submission failed"
 done
 python ${top_srcdir}/tools/storagegc.py --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-1.cfg  || fail "GC failed"
-echo "$0: sleeping for 60 seconds"
-sleep 60
+echo "$0: sleeping for $SLEEP seconds"
+sleep $SLEEP
 check_sth
 
 assert_equal "Tree size" "$(get_treesize)" 7
@@ -37,8 +39,8 @@ echo NOTE: merge backup should fail with 111 Connection refused
 ${top_srcdir}/tools/to_catlfish.py to_erl nodes/merge-2/ "init:stop()"
 python ${top_srcdir}/tools/submitcert.py --parallel=1 --store ${top_srcdir}/tools/testcerts/cert6.txt --check-sct --sct-file=submittedcerts ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || fail "Submission failed"
 
-echo "$0: sleeping for 60 seconds"
-sleep 60
+echo "$0: sleeping for $SLEEP seconds"
+sleep $SLEEP
 assert_equal "Tree size" "$(get_treesize)" 7
 
 check_sth
@@ -49,8 +51,8 @@ for i in 1 2 3 4 5 6 7 8 9 10; do
     if curl -s --cacert httpsca/demoCA/cacert.pem -4 https://localhost:8181 > /dev/null ; then break; fi
 done
 
-echo "$0: sleeping for 60 seconds"
-sleep 60
+echo "$0: sleeping for $SLEEP seconds"
+sleep $SLEEP
 assert_equal "Tree size" "$(get_treesize)" 8
 
 check_sth
diff --git a/test/scripts/light-system-test-prepare.sh b/test/scripts/light-system-test-prepare.sh
index 466f3aa..278435f 100755
--- a/test/scripts/light-system-test-prepare.sh
+++ b/test/scripts/light-system-test-prepare.sh
@@ -42,6 +42,7 @@ mkdir keys
 (cd keys ; ../../../tools/create-key.sh logkey)
 openssl pkcs8 -topk8 -nocrypt -in keys/logkey-private.pem -out keys/logkey-private.pkcs8
 mkdir mergedb
+mkdir mergedb/chains          # needed for merge_fetch worker lockfile
 touch mergedb/logorder
 mkdir mergedb-secondary
 touch mergedb-secondary/logorder