summaryrefslogtreecommitdiff
path: root/test/scripts/testutils.sh
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2017-03-01 17:04:39 +0100
committerMagnus Ahltorp <map@kth.se>2017-03-02 01:09:18 +0100
commite67187c38e4e5a97ab971554d8acf9466e9775c2 (patch)
tree5d7bad771d815f00a2df57433423b9398a82a19b /test/scripts/testutils.sh
parent163fdaeaf8fc1bc43923420309ba4a6b3ef51e11 (diff)
Refactor tests
Diffstat (limited to 'test/scripts/testutils.sh')
-rw-r--r--test/scripts/testutils.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/scripts/testutils.sh b/test/scripts/testutils.sh
index 88e9a54..4d49be8 100644
--- a/test/scripts/testutils.sh
+++ b/test/scripts/testutils.sh
@@ -25,7 +25,7 @@ get_treesize() {
get_treesize_host ${BASEURL}
}
get_treesize_host() {
- ${top_srcdir}/tools/loginfo.py --localconfig machine/merge/catlfish-test-local-merge.cfg --treesize "$1"
+ ${top_srcdir}/tools/loginfo.py --localconfig current-merge-localconfig.cfg --treesize "$1"
}
check_sth() {
@@ -36,11 +36,11 @@ check_sth_host() {
}
do_merge() {
- n=15
+ n=3000
expected_treesize=$1
while [ $n -gt 0 ]; do
- ${top_srcdir}/tools/merge --config machine/merge/catlfish-test.cfg --timing --localconfig machine/merge/catlfish-test-local-merge.cfg || fail "Merge failed"
- ${top_srcdir}/tools/mergestatus.py --config machine/merge/catlfish-test.cfg --localconfig machine/merge/catlfish-test-local-merge.cfg
+ ${top_srcdir}/tools/merge --config machine/merge-1/catlfish-test.cfg --timing --localconfig current-merge-localconfig.cfg || fail "Merge failed"
+ ${top_srcdir}/tools/mergestatus.py --config machine/merge-1/catlfish-test.cfg --localconfig current-merge-localconfig.cfg
n=$((n-1))
treesize=$(get_treesize)
[ "${treesize}" = "${expected_treesize}" ] && return