diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-12-01 11:15:05 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-12-01 11:15:05 +0100 |
| commit | 3abbd4a27979b0e4498b9bb955c715cda4123834 (patch) | |
| tree | 2e7a616b1e9cfb14e32182ceaad8bc7d411dec98 | |
| parent | 4bdb1e33a8eb620f53420219d439421da135262f (diff) | |
Increase timeouts waiting for merge.
Increase from 15 to 40 seconds. In theory, it should never be more
than 20 seconds plus actual time to do the job with a merge interval
of 10 seconds. Max wait times are 3+1 seconds in fetch, 3s in backup,
10s in sth and 3s in dist.
| -rwxr-xr-x | test/scripts/continuous-merge-test-run-1.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/scripts/continuous-merge-test-run-1.sh b/test/scripts/continuous-merge-test-run-1.sh index 92e8596..cece020 100755 --- a/test/scripts/continuous-merge-test-run-1.sh +++ b/test/scripts/continuous-merge-test-run-1.sh @@ -15,7 +15,7 @@ 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" -wait_for_equal "Tree size" "get_treesize" 7 15 +wait_for_equal "Tree size" "get_treesize" 7 40 check_sth mkdir fetchcertstore @@ -34,7 +34,7 @@ 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" -wait_for_equal "Tree size" "get_treesize" 7 15 +wait_for_equal "Tree size" "get_treesize" 7 40 check_sth ../bin/run_erl -daemon nodes/merge-2/ nodes/merge-2/log/ "exec ../bin/erl -config merge-2" @@ -44,5 +44,5 @@ 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 -wait_for_equal "Tree size" "get_treesize" 8 15 +wait_for_equal "Tree size" "get_treesize" 8 40 check_sth |