From c8af4e40e0096f60a5cf5039be775ff002619c4d Mon Sep 17 00:00:00 2001
From: Magnus Ahltorp <map@kth.se>
Date: Fri, 14 Oct 2016 16:54:57 +0200
Subject: Test failing merge backup Refactor tests

---
 test/scripts/light-system-test-run-4.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'test/scripts/light-system-test-run-4.sh')

diff --git a/test/scripts/light-system-test-run-4.sh b/test/scripts/light-system-test-run-4.sh
index 1022fd2..a2490f9 100755
--- a/test/scripts/light-system-test-run-4.sh
+++ b/test/scripts/light-system-test-run-4.sh
@@ -5,7 +5,9 @@ set -o errexit
 
 top_srcdir=$(cd $(dirname $0)/../..; pwd)
 
-. ${top_srcdir}/test/test.shvars
+. ${top_srcdir}/test/scripts/testutils.sh
 
-${top_srcdir}/tools/merge --config ${top_srcdir}/test/catlfish-test.cfg --localconfig ${top_srcdir}/test/catlfish-test-local-merge.cfg || (echo "Merge failed" ; false)
-${top_srcdir}/tools/check-sth.py ${BASEURL} --publickey=keys/logkey.pem --cur-sth=stored-sth --cafile httpsca/demoCA/cacert.pem
+do_merge
+check_sth
+
+assert_equal "Tree size" "$(get_treesize)" 9
-- 
cgit v1.1