From 37cab78a89a4e6f7ec29c1cde1e68dfc5c46bd9d Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 24 Sep 2015 16:47:32 +0200 Subject: Merge is now run by shell script tools/merge. tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 --- tools/testcase1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/testcase1.py') diff --git a/tools/testcase1.py b/tools/testcase1.py index c66d976..697cc99 100755 --- a/tools/testcase1.py +++ b/tools/testcase1.py @@ -37,7 +37,7 @@ logpublickey = get_public_key_from_file(logpublickeyfile) def testgroup(name): global indentation - print name + ":" + print "testgroup " + name + ":" indentation = " " def print_error(message, *args): @@ -147,7 +147,7 @@ def get_and_check_entry(timestamp, chain, leaf_index, baseurl): len(submittedcertchain)) def merge(): - return subprocess.call(["../tools/merge.py", "--config", "../test/catlfish-test.cfg", + return subprocess.call(["../tools/merge", "--config", "../test/catlfish-test.cfg", "--localconfig", "../test/catlfish-test-local-merge.cfg"]) mergeresult = merge() -- cgit v1.1