Added external merging support

1 files changed, 13 insertions, 0 deletions

diff --git a/tools/testcase1.py b/tools/testcase1.py
index eab6c6f..2d5e0e8 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 # Copyright (c) 2014, NORDUnet A/S.
 # See LICENSE for licensing information.
@@ -125,12 +126,16 @@ testgroup("cert1")
 
 result1 = do_add_chain(cc1)
 
+subprocess.call(["./merge.py"])
+
 print_and_check_tree_size(1)
 
 result2 = do_add_chain(cc1)
 
 assert_equal(result2["timestamp"], result1["timestamp"], "timestamp")
 
+subprocess.call(["./merge.py"])
+
 print_and_check_tree_size(1)
 
 # TODO: add invalid cert and check that it generates an error
@@ -142,6 +147,8 @@ testgroup("cert2")
 
 result3 = do_add_chain(cc2)
 
+subprocess.call(["./merge.py"])
+
 print_and_check_tree_size(2)
 
 get_and_validate_proof(result1["timestamp"], cc1, 0, 1)
@@ -151,6 +158,8 @@ testgroup("cert3")
 
 result4 = do_add_chain(cc3)
 
+subprocess.call(["./merge.py"])
+
 print_and_check_tree_size(3)
 
 get_and_validate_proof(result1["timestamp"], cc1, 0, 2)
@@ -161,6 +170,8 @@ testgroup("cert4")
 
 result5 = do_add_chain(cc4)
 
+subprocess.call(["./merge.py"])
+
 print_and_check_tree_size(4)
 
 get_and_validate_proof(result1["timestamp"], cc1, 0, 2)
@@ -172,6 +183,8 @@ testgroup("cert5")
 
 result6 = do_add_chain(cc5)
 
+subprocess.call(["./merge.py"])
+
 print_and_check_tree_size(5)
 
 get_and_validate_proof(result1["timestamp"], cc1, 0, 3)