summaryrefslogtreecommitdiff
path: root/tools/testcase1.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-03-03 15:33:39 +0100
committerMagnus Ahltorp <map@kth.se>2015-03-03 15:33:39 +0100
commitff18e0fdd57a6b485f427173fe7febee03345037 (patch)
treed3f223fcdeb889a09fd8bb4fd250bd00373daf69 /tools/testcase1.py
parent4e1bcab3f91f975a19710a4350bbee0e9af5168e (diff)
merge.py: use external signing
Diffstat (limited to 'tools/testcase1.py')
-rwxr-xr-xtools/testcase1.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testcase1.py b/tools/testcase1.py
index c87e8eb..0c0f728 100755
--- a/tools/testcase1.py
+++ b/tools/testcase1.py
@@ -136,7 +136,7 @@ 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"])
+ 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"])
print_and_check_tree_size(0)