diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-03-23 16:12:13 +0100 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2015-03-23 16:21:24 +0100 |
| commit | d645194006bf3c81372073af9784f7d993096444 (patch) | |
| tree | b6fab9e2e1ee5037a23e0cad79ba2933dafe53c0 /tools/testcase1.py | |
| parent | 510ecc5702ea36395addc733789756ce8075517e (diff) | |
Generate config from master config. Verify responses in merge.py.
Diffstat (limited to 'tools/testcase1.py')
| -rwxr-xr-x | tools/testcase1.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/testcase1.py b/tools/testcase1.py index 7b3229d..4502b56 100755 --- a/tools/testcase1.py +++ b/tools/testcase1.py @@ -15,9 +15,9 @@ import itertools from certtools import * baseurls = ["https://127.0.0.1:8080/"] -certfiles = ["testcerts/cert1.txt", "testcerts/cert2.txt", - "testcerts/cert3.txt", "testcerts/cert4.txt", - "testcerts/cert5.txt"] +certfiles = ["../tools/testcerts/cert1.txt", "../tools/testcerts/cert2.txt", + "../tools/testcerts/cert3.txt", "../tools/testcerts/cert4.txt", + "../tools/testcerts/cert5.txt"] cc1 = get_certs_from_file(certfiles[0]) cc2 = get_certs_from_file(certfiles[1]) @@ -138,10 +138,8 @@ def get_and_check_entry(timestamp, chain, leaf_index, baseurl): 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", "--signing", "https://127.0.0.1:8088/", - "--own-keyname", "merge-1", "--own-keyfile", "../rel/privatekeys/merge-1-private.pem"]) + return subprocess.call(["../tools/merge.py", "--config", "../test/catlfish-test.cfg", + "--localconfig", "../test/catlfish-test-local-merge.cfg"]) mergeresult = merge() assert_equal(mergeresult, 0, "merge", quiet=True) |