Merge branch 'precert2'

Conflicts:
	Makefile

1 files changed, 6 insertions, 3 deletions

diff --git a/tools/testcase1.py b/tools/testcase1.py
index c87e8eb..73613fb 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -136,13 +136,13 @@ def get_and_check_entry(timestamp, chain, leaf_index):
                     len(submittedcertchain))
 
 def merge():
-    return subprocess.call(["./merge.py", "--baseurl", "https://127.0.0.1:8080/", "--frontend", "https://127.0.0.1:8082/", "--storage", "https://127.0.0.1:8081/", "--mergedb", "../rel/mergedb", "--keyfile", "../rel/test/eckey.pem", "--own-keyname", "merge-1", "--own-keyfile", "../rel/privatekeys/merge-1-private.pem"])
-
-print_and_check_tree_size(0)
+    return subprocess.call(["./merge.py", "--baseurl", "https://127.0.0.1:8080/", "--frontend", "https://127.0.0.1:8082/", "--storage", "https://127.0.0.1:8081/", "--mergedb", "../rel/mergedb", "--signing", "https://127.0.0.1:8088/", "--own-keyname", "merge-1", "--own-keyfile", "../rel/privatekeys/merge-1-private.pem"])
 
 mergeresult = merge()
 assert_equal(mergeresult, 0, "merge", quiet=True)
 
+print_and_check_tree_size(0)
+
 testgroup("cert1")
 
 result1 = do_add_chain(cc1)
@@ -230,6 +230,9 @@ get_and_validate_proof(result4["timestamp"], cc3, 2, 3)
 get_and_validate_proof(result5["timestamp"], cc4, 3, 3)
 get_and_validate_proof(result6["timestamp"], cc5, 4, 1)
 
+mergeresult = merge()
+assert_equal(mergeresult, 0, "merge", quiet=True)
+
 for first_size in range(1, 5):
     for second_size in range(first_size + 1, 6):
         get_and_validate_consistency_proof(size_sth[first_size], size_sth[second_size], first_size, second_size)