diff options
| author | Magnus Ahltorp <map@kth.se> | 2016-10-14 16:54:57 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2016-10-14 16:54:57 +0200 |
| commit | c8af4e40e0096f60a5cf5039be775ff002619c4d (patch) | |
| tree | e059ba998a4624fa950c12e2ca369be30d92c61d /test/scripts/light-system-test-run-3.sh | |
| parent | c1dfe32e2ba948e62535102ab6dbafa60c3c6eda (diff) | |
Test failing merge backup
Refactor tests
Diffstat (limited to 'test/scripts/light-system-test-run-3.sh')
| -rwxr-xr-x | test/scripts/light-system-test-run-3.sh | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/test/scripts/light-system-test-run-3.sh b/test/scripts/light-system-test-run-3.sh index f84317b..bb042d2 100755 --- a/test/scripts/light-system-test-run-3.sh +++ b/test/scripts/light-system-test-run-3.sh @@ -5,12 +5,22 @@ set -o errexit top_srcdir=$(cd $(dirname $0)/../..; pwd) -. ${top_srcdir}/test/test.shvars - -${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || (echo "Merge failed" ; false) -${top_srcdir}/tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem -python ${top_srcdir}/tools/submitcert.py --parallel=1 --store ${top_srcdir}/tools/testcerts/cert7.txt --check-sct --sct-file=submittedcerts-7 ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || (echo "Submission failed" ; false) -${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || (echo "Merge failed" ; false) -python ${top_srcdir}/tools/verifysct.py --sct-file=submittedcerts --parallel 1 ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || (echo "Verification of SCT:s failed"; false) -python ${top_srcdir}/tools/verifysct.py --sct-file=submittedcerts-7 --parallel 1 ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || (echo "Verification of SCT:s failed"; false) -${top_srcdir}/tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem +. ${top_srcdir}/test/scripts/testutils.sh + +do_merge +check_sth + +assert_equal "Tree size" "$(get_treesize)" 8 + +python ${top_srcdir}/tools/submitcert.py --parallel=1 --store ${top_srcdir}/tools/testcerts/cert7.txt --check-sct --sct-file=submittedcerts-7 ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || fail "Submission failed" + +assert_equal "Tree size" "$(get_treesize)" 8 + +do_merge + +assert_equal "Tree size" "$(get_treesize)" 9 + +python ${top_srcdir}/tools/verifysct.py --sct-file=submittedcerts --parallel 1 ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || fail "Verification of SCT:s failed" +python ${top_srcdir}/tools/verifysct.py --sct-file=submittedcerts-7 --parallel 1 ${BASEURL} --publickey=keys/logkey.pem --cafile httpsca/demoCA/cacert.pem || fail "Verification of SCT:s failed" + +check_sth |