diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/catlfish-test-local-statusserver.cfg | 29 | ||||
| -rw-r--r-- | test/catlfish-test-mergefailover.cfg.in | 4 | ||||
| -rw-r--r-- | test/catlfish-test-redistribute-frontend.cfg.in | 4 | ||||
| -rw-r--r-- | test/catlfish-test.cfg.in | 4 | ||||
| -rwxr-xr-x | test/scripts/light-system-test.sh | 4 | ||||
| -rwxr-xr-x | test/scripts/perf-test.sh | 4 |
6 files changed, 39 insertions, 10 deletions
diff --git a/test/catlfish-test-local-statusserver.cfg b/test/catlfish-test-local-statusserver.cfg new file mode 100644 index 0000000..190c611 --- /dev/null +++ b/test/catlfish-test-local-statusserver.cfg @@ -0,0 +1,29 @@ +localnodes: + - statusserver + +publichttpaddresses: + statusserver: 127.0.0.1:9080 + +paths: + configdir: . + https_certfile: httpscert/httpscert-1.pem + https_keyfile: httpscert/httpskey-1.pem + https_cacertfile: httpsca/demoCA/cacert.pem + public_cacertfile: httpsca/demoCA/cacert.pem + publickeys: publickeys + logpublickey: keys/logkey.pem + privatekeys: privatekeys + +ratelimits: + add_chain: 1000 per second + +dbbackend: permdb + +logadminkey: MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQ + Ah9sZ2CD+JeLbprS6AFcZbo0TGCH0rtEnr2Q3JW0ylhfA+ + 0/WLu755b3soVX/wI23vqCVGC7N9fOB2WUltveQ== + +configurl: file:///CURRENTWORKINGDIRECTORY/catlfish-test-generated.cfg + +#options: +# - sctcaching diff --git a/test/catlfish-test-mergefailover.cfg.in b/test/catlfish-test-mergefailover.cfg.in index 7f0fbcb..81cbfc7 100644 --- a/test/catlfish-test-mergefailover.cfg.in +++ b/test/catlfish-test-mergefailover.cfg.in @@ -39,7 +39,7 @@ storage-quorum-size: 1 mmd: 86400 -statsservers: - - name: statsserver +statusservers: + - name: statusserver address: localhost:9081 publicaddress: localhost:9082 diff --git a/test/catlfish-test-redistribute-frontend.cfg.in b/test/catlfish-test-redistribute-frontend.cfg.in index 725c7c5..ef59a2d 100644 --- a/test/catlfish-test-redistribute-frontend.cfg.in +++ b/test/catlfish-test-redistribute-frontend.cfg.in @@ -39,7 +39,7 @@ storage-quorum-size: 1 mmd: 86400 -statsservers: - - name: statsserver +statusservers: + - name: statusserver address: localhost:9081 publicaddress: localhost:9082 diff --git a/test/catlfish-test.cfg.in b/test/catlfish-test.cfg.in index 18724e8..d16e5d3 100644 --- a/test/catlfish-test.cfg.in +++ b/test/catlfish-test.cfg.in @@ -39,7 +39,7 @@ storage-quorum-size: 1 mmd: 86400 -statsservers: - - name: statsserver +statusservers: + - name: statusserver address: localhost:9081 publicaddress: localhost:9082 diff --git a/test/scripts/light-system-test.sh b/test/scripts/light-system-test.sh index da91929..f8b63f8 100755 --- a/test/scripts/light-system-test.sh +++ b/test/scripts/light-system-test.sh @@ -18,11 +18,11 @@ tests_stop() { } tests_stop_all() { - ${SCRIPTS}/light-system-test-stop.sh mergeprimary mergesecondary frontend signing statsserver + ${SCRIPTS}/light-system-test-stop.sh mergeprimary mergesecondary frontend signing statusserver } ${SCRIPTS}/light-system-test-prepare.sh -tests_start statsserver signing +tests_start statusserver signing tests_start merge_2only frontendexceptlast ${top_srcdir}/tools/initlog.py --config machine/merge-1/catlfish-test.cfg --localconfig machine/merge-1/catlfish-test-local-merge-1.cfg tests_start mergeprimary diff --git a/test/scripts/perf-test.sh b/test/scripts/perf-test.sh index 0d6daa3..9b77ddb 100755 --- a/test/scripts/perf-test.sh +++ b/test/scripts/perf-test.sh @@ -18,7 +18,7 @@ tests_stop() { } tests_stop_all() { - ${SCRIPTS}/light-system-test-stop.sh mergeprimary mergesecondary frontend signing statsserver + ${SCRIPTS}/light-system-test-stop.sh mergeprimary mergesecondary frontend signing statusserver } ${SCRIPTS}/light-system-test-prepare.sh @@ -26,7 +26,7 @@ ${top_srcdir}/tools/initlog.py --config machine/merge-1/catlfish-test.cfg --loca cp ${top_srcdir}/test/known_roots/* known_roots -tests_start signing statsserver +tests_start signing statusserver tests_start merge_2only frontendexceptlast mergeprimary do_merge 0 |