summaryrefslogtreecommitdiff
path: root/test/scripts/light-system-test-run-2.sh
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2016-10-14 16:54:57 +0200
committerMagnus Ahltorp <map@kth.se>2016-10-14 16:54:57 +0200
commitc8af4e40e0096f60a5cf5039be775ff002619c4d (patch)
treee059ba998a4624fa950c12e2ca369be30d92c61d /test/scripts/light-system-test-run-2.sh
parentc1dfe32e2ba948e62535102ab6dbafa60c3c6eda (diff)
Test failing merge backup
Refactor tests
Diffstat (limited to 'test/scripts/light-system-test-run-2.sh')
-rwxr-xr-xtest/scripts/light-system-test-run-2.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/scripts/light-system-test-run-2.sh b/test/scripts/light-system-test-run-2.sh
index 1a30c4c..4c8bbdb 100755
--- a/test/scripts/light-system-test-run-2.sh
+++ b/test/scripts/light-system-test-run-2.sh
@@ -5,8 +5,10 @@ set -o errexit
top_srcdir=$(cd $(dirname $0)/../..; pwd)
-. ${top_srcdir}/test/test.shvars
+. ${top_srcdir}/test/scripts/testutils.sh
-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)
-../../tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem
-python ${top_srcdir}/tools/storagegc.py --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-1.cfg || (echo "GC failed" ; false)
+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"
+
+check_sth
+
+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"