diff options
| author | Magnus Ahltorp <map@kth.se> | 2017-02-06 15:08:42 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2017-02-06 15:08:42 +0100 |
| commit | 8c1e3ac28cbb902b540f776886a6556c40d3f601 (patch) | |
| tree | 2e629effbfc5000c656b0fbe0389af56dbcfafff /test/scripts/light-system-test-run-1.sh | |
| parent | 8a1f3a5f5b1458aceb7567add95e7637e9c2e5fc (diff) | |
Wait for merge in tests
Diffstat (limited to 'test/scripts/light-system-test-run-1.sh')
| -rwxr-xr-x | test/scripts/light-system-test-run-1.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/scripts/light-system-test-run-1.sh b/test/scripts/light-system-test-run-1.sh index 1ad56a8..585a829 100755 --- a/test/scripts/light-system-test-run-1.sh +++ b/test/scripts/light-system-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 machine/machine-1/catlfish-test.cfg --localconfig machine/machine-1/catlfish-test-local-1.cfg || fail "GC failed" -do_merge +do_merge 7 check_sth assert_equal "Tree size" "$(get_treesize)" 7 @@ -36,10 +36,8 @@ ${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 NOTE: merge backup should fail with 111 Connection refused -${top_srcdir}/tools/merge_fetch.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg || fail "Merge failed" -${top_srcdir}/tools/merge_backup.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg && fail "Merge backup should have failed" -${top_srcdir}/tools/merge_sth.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg || fail "Merge failed" -${top_srcdir}/tools/merge_dist.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg || fail "Merge failed" +do_merge 7 +sleep 3 assert_equal "Tree size" "$(get_treesize)" 7 @@ -50,7 +48,7 @@ for i in 1 2 3 4 5 6 7 8 9 10; do sleep 0.5 ; \ if curl -s --cacert httpsca/demoCA/cacert.pem -4 https://localhost:8181 > /dev/null ; then break; fi done -do_merge +do_merge 8 assert_equal "Tree size" "$(get_treesize)" 8 |