diff options
| author | Magnus Ahltorp <map@kth.se> | 2017-02-07 16:29:46 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2017-02-07 21:22:52 +0100 |
| commit | 142b19cda6f9c6133c3559f320bb96b10447fb3b (patch) | |
| tree | b96a7d2f23502ff0486ee4ea541af348ccf51d72 /test/scripts/light-system-test-run-1.sh | |
| parent | 70a87a1d878106aa97205507c3cd3eb9ba1667f2 (diff) | |
Improve start and stop of Erlang nodes
Diffstat (limited to 'test/scripts/light-system-test-run-1.sh')
| -rwxr-xr-x | test/scripts/light-system-test-run-1.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/scripts/light-system-test-run-1.sh b/test/scripts/light-system-test-run-1.sh index 585a829..7d52ed7 100755 --- a/test/scripts/light-system-test-run-1.sh +++ b/test/scripts/light-system-test-run-1.sh @@ -32,7 +32,8 @@ python ${top_srcdir}/tools/comparecert.py ${top_srcdir}/tools/testcerts/cert5.tx python ${top_srcdir}/tools/comparecert.py ${top_srcdir}/tools/testcerts/pre1.txt:${top_srcdir}/tools/testcerts/pre2.txt fetchcertstore/00000005:fetchcertstore/00000006 || fail"Verification failed" 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" -${top_srcdir}/tools/to_catlfish.py to_erl nodes/merge-2/ "init:stop()" +${top_srcdir}/test/scripts/light-system-test-stop.sh mergesecondary + 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 @@ -42,12 +43,10 @@ sleep 3 assert_equal "Tree size" "$(get_treesize)" 7 check_sth -../bin/run_erl -daemon nodes/merge-2/ nodes/merge-2/log/ "exec ../bin/erl -config merge-2" -for i in 1 2 3 4 5 6 7 8 9 10; do - echo "waiting for system to start" ; \ - sleep 0.5 ; \ - if curl -s --cacert httpsca/demoCA/cacert.pem -4 https://localhost:8181 > /dev/null ; then break; fi -done + + +${top_srcdir}/test/scripts/light-system-test-start.sh mergesecondary + do_merge 8 assert_equal "Tree size" "$(get_treesize)" 8 |