diff options
| author | Magnus Ahltorp <map@kth.se> | 2017-03-01 17:04:39 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2017-03-09 00:50:48 +0100 |
| commit | 8367911e8683311cd6521bcf069c8c71620595f8 (patch) | |
| tree | 6d95b23a32108c35ba244d7481ca775369cb28e6 /test/scripts/light-system-test-prepare-merge-takeover.sh | |
| parent | 221c6771035d7a3c1e0441a46248a44ca2e99077 (diff) | |
Refactor tests
Diffstat (limited to 'test/scripts/light-system-test-prepare-merge-takeover.sh')
| -rwxr-xr-x | test/scripts/light-system-test-prepare-merge-takeover.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/scripts/light-system-test-prepare-merge-takeover.sh b/test/scripts/light-system-test-prepare-merge-takeover.sh index 057af3d..f27b7f9 100755 --- a/test/scripts/light-system-test-prepare-merge-takeover.sh +++ b/test/scripts/light-system-test-prepare-merge-takeover.sh @@ -7,9 +7,8 @@ top_srcdir=$(cd $(dirname $0)/../..; pwd) . ${top_srcdir}/test/scripts/testutils.sh -mv mergedb mergedb-down -mv mergedb-secondary mergedb -mv mergedb/verifiedsize mergedb/verifiedsize.OFF -mkdir mergedb-secondary -touch mergedb-secondary/logorder -printf 0 > mergedb-secondary/verifiedsize +mv machine/merge-1/db/sth machine/merge-1/db/sth.OFF + +${top_srcdir}/tools/initlog.py --config machine/merge-2/catlfish-test.cfg --localconfig machine/merge-2/catlfish-test-local-merge-2.cfg --promote-secondary + +cp machine/merge-2/catlfish-test-local-merge-2.cfg current-merge-localconfig.cfg |