diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-03-09 15:17:58 +0100 |
| commit | 863ef44a16759501c7ce939e93bf2891a552b2e3 (patch) | |
| tree | 0fc28971759e60a044425d6d3f45ccfb596ed2e0 /test/scripts/light-system-test.sh | |
| parent | 221c6771035d7a3c1e0441a46248a44ca2e99077 (diff) | |
| parent | a08cb72fa60bdb11873a2409c3b5aa8ff2b4667d (diff) | |
Merge remote-tracking branch 'refs/remotes/map/refactor-tests'
Diffstat (limited to 'test/scripts/light-system-test.sh')
| -rwxr-xr-x | test/scripts/light-system-test.sh | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh index 217fb2c..69eb5c7 100755 --- a/test/scripts/light-system-test.sh +++ b/test/scripts/light-system-test.sh @@ -18,16 +18,18 @@ tests_stop() { } tests_stop_all() { - ${SCRIPTS}/light-system-test-stop.sh mergeprimary mergesecondary frontend storage signing + ${SCRIPTS}/light-system-test-stop.sh mergeprimary mergesecondary frontend signing } ${SCRIPTS}/light-system-test-prepare.sh -tests_start signing mergesecondary storage frontend -${top_srcdir}/tools/initlog.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg +tests_start signing +tests_start merge_2only frontendexceptlast +${top_srcdir}/tools/initlog.py --config machine/merge-1/catlfish-test.cfg --localconfig machine/merge-1/catlfish-test-local-merge-1.cfg tests_start mergeprimary ${SCRIPTS}/light-system-test-run-1.sh || (echo "Tests failed"; sleep 5; tests_stop_all; false) + sleep 5 -tests_stop_all +tests_stop mergeprimary merge_2only frontendexceptlast sleep 5 echo echo @@ -39,10 +41,10 @@ echo echo echo echo -tests_start signing mergesecondary storage frontend mergeprimary +tests_start merge_2only frontendexceptlast mergeprimary ${SCRIPTS}/light-system-test-run-2.sh || (echo "Tests failed"; sleep 5; tests_stop_all; false) sleep 5 -tests_stop_all +tests_stop mergeprimary merge_2only sleep 5 echo echo @@ -54,13 +56,13 @@ echo echo echo echo +${top_srcdir}/tools/genconfig.sh ${top_srcdir}/test/catlfish-test-mergefailover.cfg.in privatekeys keys/logkey.pem httpsca/demoCA/cacert.pem ${top_srcdir}/test/logadminkey-private.pem catlfish-test-generated.cfg +${top_srcdir}/test/scripts/reload-config.sh ${SCRIPTS}/light-system-test-prepare-merge-takeover.sh -tests_start signing mergesecondary storage frontend -${top_srcdir}/tools/initlog.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg --promote-secondary -tests_start mergeprimary +tests_start merge_3only mergeprimary ${SCRIPTS}/light-system-test-run-3.sh || (echo "Tests failed"; sleep 5; tests_stop_all; false) sleep 5 -tests_stop_all +tests_stop mergeprimary merge_3only frontendexceptlast sleep 5 echo echo @@ -72,8 +74,9 @@ echo echo echo echo -${SCRIPTS}/light-system-test-prepare-redistribute-frontend.sh -tests_start signing mergesecondary storage frontend mergeprimary +${top_srcdir}/tools/genconfig.sh ${top_srcdir}/test/catlfish-test-redistribute-frontend.cfg.in privatekeys keys/logkey.pem httpsca/demoCA/cacert.pem ${top_srcdir}/test/logadminkey-private.pem catlfish-test-generated.cfg +${top_srcdir}/test/scripts/reload-config.sh +tests_start merge_3only frontendexceptfirst mergeprimary ${SCRIPTS}/light-system-test-run-4.sh || (echo "Tests failed"; sleep 5; tests_stop_all; false) echo @@ -87,6 +90,7 @@ echo echo echo +${top_srcdir}/tools/genconfig.sh ${top_srcdir}/test/catlfish-test-redistribute-frontend.cfg.in privatekeys keys/logkey.pem httpsca/demoCA/cacert.pem ${top_srcdir}/test/logadminkey-private.pem catlfish-test-generated.cfg ${SCRIPTS}/light-system-test-run-5.sh || (echo "Tests failed"; sleep 5; tests_stop_all; false) sleep 5 |