Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge

Conflicts:
	src/v1.erl
	tools/merge.py
	tools/testcase1.py

1 files changed, 16 insertions, 7 deletions

diff --git a/tools/testcase1.py b/tools/testcase1.py
index 2d5e0e8..639cd69 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -105,7 +105,7 @@ def get_and_check_entry(timestamp, chain, leaf_index):
         assert_equal(fetchedcert, submittedcert, "cert %d in chain" % (i,))
 
     if len(certchain) == len(submittedcertchain) + 1:
-        last_issuer = get_cert_info(certs[-1])["issuer"]
+        last_issuer = get_cert_info(submittedcertchain[-1])["issuer"]
         root_subject = get_cert_info(certchain[-1])["subject"]
         if last_issuer == root_subject:
             print_success("fetched chain has an appended root cert")
@@ -122,11 +122,15 @@ def get_and_check_entry(timestamp, chain, leaf_index):
 
 print_and_check_tree_size(0)
 
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
+
 testgroup("cert1")
 
 result1 = do_add_chain(cc1)
 
-subprocess.call(["./merge.py"])
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
 
 print_and_check_tree_size(1)
 
@@ -134,7 +138,8 @@ result2 = do_add_chain(cc1)
 
 assert_equal(result2["timestamp"], result1["timestamp"], "timestamp")
 
-subprocess.call(["./merge.py"])
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
 
 print_and_check_tree_size(1)
 
@@ -147,7 +152,8 @@ testgroup("cert2")
 
 result3 = do_add_chain(cc2)
 
-subprocess.call(["./merge.py"])
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
 
 print_and_check_tree_size(2)
 
@@ -158,7 +164,8 @@ testgroup("cert3")
 
 result4 = do_add_chain(cc3)
 
-subprocess.call(["./merge.py"])
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
 
 print_and_check_tree_size(3)
 
@@ -170,7 +177,8 @@ testgroup("cert4")
 
 result5 = do_add_chain(cc4)
 
-subprocess.call(["./merge.py"])
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
 
 print_and_check_tree_size(4)
 
@@ -183,7 +191,8 @@ testgroup("cert5")
 
 result6 = do_add_chain(cc5)
 
-subprocess.call(["./merge.py"])
+mergeresult = subprocess.call(["./merge.py"])
+assert_equal(mergeresult, 0, "merge", quiet=True)
 
 print_and_check_tree_size(5)