summaryrefslogtreecommitdiff
path: root/tools/testcase1.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-10-20 14:33:41 +0200
committerLinus Nordberg <linus@nordberg.se>2014-10-29 15:04:42 +0100
commit4325a43d3d1476cc601b631620df89340ec4c7e2 (patch)
tree2d7c404c61f5a68bce941b386432d1e56bc74974 /tools/testcase1.py
parent80e21b72beb000a864c0fb5483a1fdeb9499c31d (diff)
Added external merging support
Diffstat (limited to 'tools/testcase1.py')
-rwxr-xr-xtools/testcase1.py13
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)