diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-09-24 16:47:32 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-09-24 16:47:32 +0200 |
| commit | 37cab78a89a4e6f7ec29c1cde1e68dfc5c46bd9d (patch) | |
| tree | 6ed8ad47810ed8b6aa9aef0d3fe1a8ea459fb0f8 /tools/testcase1.py | |
| parent | 98c4ab09dd0f04bd3aa5567fcfb05cbb6a3a75f1 (diff) | |
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
Diffstat (limited to 'tools/testcase1.py')
| -rwxr-xr-x | tools/testcase1.py | 4 |
1 files changed, 2 insertions, 2 deletions
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() |