diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-03-31 14:27:23 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2015-03-31 14:27:23 +0200 |
| commit | 6b62ebbf1de5b9e55b04e9cfafd0620f1374c2d4 (patch) | |
| tree | 80a4dccbd98c26a80c07146a93318ba1edece01f /test | |
| parent | 22cefc84254cae1f57195da819eba69dbacb5a6e (diff) | |
Cleanup tests and use urllib2.build_openercleanup-tests
Remove unused files
Generate test config files directly in release directory
Move test database files to "tests" directory
Generate log key when preparing tests
Report error when STH not found in v1.erl
Make merge, fetchallcerts, submitcert, verifysct, and testcase1 take log key as argument
Diffstat (limited to 'test')
| -rw-r--r-- | test/catlfish-test-local-1.cfg | 10 | ||||
| -rw-r--r-- | test/catlfish-test-local-merge.cfg | 8 | ||||
| -rw-r--r-- | test/catlfish-test-local-signing.cfg | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/test/catlfish-test-local-1.cfg b/test/catlfish-test-local-1.cfg index 608d4c0..7caacdc 100644 --- a/test/catlfish-test-local-1.cfg +++ b/test/catlfish-test-local-1.cfg @@ -10,15 +10,15 @@ publicaddresses: frontend-1: 127.0.0.1:8080 paths: - configdir: test/config/ - knownroots: known_roots + configdir: . + knownroots: tests/known_roots https_certfile: catlfish/webroot/certs/webcert.pem https_keyfile: catlfish/webroot/keys/webkey.pem https_cacertfile: catlfish/webroot/certs/webcert.pem db: tests/machine/machine-1/db/ - publickeys: publickeys - logpublickey: test/eckey-public.pem - privatekeys: privatekeys + publickeys: tests/publickeys + logpublickey: tests/keys/logkey.pem + privatekeys: tests/privatekeys #options: # - sctcaching diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg index b7f5009..4a77708 100644 --- a/test/catlfish-test-local-merge.cfg +++ b/test/catlfish-test-local-merge.cfg @@ -1,8 +1,8 @@ nodename: merge-1 paths: - mergedb: ../rel/mergedb + mergedb: tests/mergedb https_cacertfile: catlfish/webroot/certs/webcert.pem - publickeys: publickeys - logpublickey: test/eckey-public.pem - privatekeys: privatekeys + publickeys: tests/publickeys + logpublickey: tests/keys/logkey.pem + privatekeys: tests/privatekeys diff --git a/test/catlfish-test-local-signing.cfg b/test/catlfish-test-local-signing.cfg index 2cc4df2..b08bf2f 100644 --- a/test/catlfish-test-local-signing.cfg +++ b/test/catlfish-test-local-signing.cfg @@ -5,11 +5,11 @@ addresses: signing-1: 127.0.0.1:8088 paths: - configdir: test/config/ + configdir: . https_certfile: catlfish/webroot/certs/webcert.pem https_keyfile: catlfish/webroot/keys/webkey.pem https_cacertfile: catlfish/webroot/certs/webcert.pem - publickeys: publickeys - logpublickey: test/eckey-public.pem - logprivatekey: test/eckey.pem - privatekeys: privatekeys + publickeys: tests/publickeys + logpublickey: tests/keys/logkey.pem + logprivatekey: tests/keys/logkey-private.pem + privatekeys: tests/privatekeys |