diff options
| author | Linus Nordberg <linus@nordberg.se> | 2015-02-27 14:32:26 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2015-02-27 14:32:26 +0100 |
| commit | 95bf10b2934f58fbeb7fd6d44a4e92eba492b431 (patch) | |
| tree | 98438ad2fb7e1c0086375e437c3331c81d3dfe4c /tools/testcase1.py | |
| parent | eb879d7b501a840c2801ca91e3f06ef6b81d2277 (diff) | |
| parent | 90bd73177964246a0e1a5d6c5e4255dcc8ec700d (diff) | |
Merge remote-tracking branch 'refs/remotes/map/authentication2'
Diffstat (limited to 'tools/testcase1.py')
| -rwxr-xr-x | tools/testcase1.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testcase1.py b/tools/testcase1.py index a41a783..c87e8eb 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"]) + 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) |