From e67187c38e4e5a97ab971554d8acf9466e9775c2 Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Wed, 1 Mar 2017 17:04:39 +0100
Subject: Refactor tests

---
 test/scripts/testutils.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/scripts/testutils.sh')

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
-- 
cgit v1.1