Generate config from master config. Verify responses in merge.py.

1 files changed, 38 insertions, 38 deletions

diff --git a/Makefile b/Makefile
index e1a81fb..8223a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,38 +16,34 @@ release: all
 	cp storage_node.config rel
 	cp storage_node_httpd.conf rel
 	mkdir rel/catlfish
-	mkdir rel/db
-	mkdir rel/mergedb
-	mkdir rel/mergedb/chains
-	touch rel/mergedb/logorder
-	printf "0" > rel/db/treesize
 	cp -r webroot rel/catlfish
 	test -d rel/catlfish/webroot/log || mkdir rel/catlfish/webroot/log
 
+-include test/test.mk
+
 tests-prepare:
+	rm -r rel/mergedb || true
+	mkdir rel/mergedb
+	mkdir rel/mergedb/chains
+	touch rel/mergedb/logorder
 	rm -r rel/known_roots || true
 	mkdir rel/known_roots
 	cp tools/testcerts/roots/* rel/known_roots
-
-	mkdir -p test/nodes/frontend-1/log
-	mkdir -p test/nodes/storage-1/log
-	mkdir -p test/nodes/storage-2/log
-	mkdir -p test/nodes/signing-1/log
-	cp test/config/frontend-1.config rel
-	cp test/config/storage-1.config rel
-	cp test/config/signing-1.config rel
 	cp -r test/config/privatekeys rel
 	cp -r test/config/publickeys rel
 	rm -r rel/tests || true
-	mkdir -p rel/tests/machine/machine-1/db
-	printf "0" > rel/tests/machine/machine-1/db/treesize
-	mkdir -p rel/tests/machine/machine-2/db
-	printf "0" > rel/tests/machine/machine-2/db/treesize
-	touch rel/tests/machine/machine-1/db/index
-	touch rel/tests/machine/machine-1/db/newentries
-
-NODES=frontend-1 storage-1 signing-1
-TESTURLS=https://127.0.0.1:8080/ https://127.0.0.1:8081/ https://127.0.0.1:8082/ https://127.0.0.1:8088/
+	@for machine in $(MACHINES); do \
+	  tools/compileconfig.py --config=test/catlfish-test.cfg --localconfig test/catlfish-test-local-$$machine.cfg ; \
+	  mkdir -p rel/tests/machine/machine-$$machine/db ; \
+	  printf "0" > rel/tests/machine/machine-$$machine/db/treesize ; \
+	  touch rel/tests/machine/machine-$$machine/db/index ; \
+	  touch rel/tests/machine/machine-$$machine/db/newentries ; \
+	done
+	tools/compileconfig.py --config=test/catlfish-test.cfg --localconfig test/catlfish-test-local-signing.cfg
+	@for node in $(NODES); do \
+	  mkdir -p test/nodes/$$node/log ; \
+	  cp test/config/$$node.config rel ; \
+	done
 
 tests-start:
 	@for node in $(NODES); do \
@@ -57,45 +53,49 @@ tests-start:
 	  echo "waiting for system to start" ; \
 	  sleep 0.5 ; \
 	  allstarted=1 ; \
+	  notstarted= ; \
 	  for testurl in $(TESTURLS); do \
-	    if curl -s -k $$testurl > /dev/null ; then : ; else allstarted=0 ; fi ; \
+	    if curl -s -k https://$$testurl > /dev/null ; then : ; else allstarted=0 ; notstarted="$$testurl $$notstarted" ; fi ; \
 	    : ; \
 	  done ; \
-	  if [ $$allstarted -eq 1 ]; then break ; fi ; \
+	  if [ $$allstarted -eq 1 ]; then break ; \
+	  elif [ $$i -eq 10 ]; then echo Not started: $$notstarted ; fi ; \
 	done
 
 tests-run:
-	@(cd tools ; python testcase1.py ) || echo "Tests failed"
-	@(cd tools ; python fetchallcerts.py https://127.0.0.1:8080/) || echo "Verification failed"
-	@(cd tools ; python submitcert.py --store testcerts/cert1.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python submitcert.py --store testcerts/cert2.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python submitcert.py --store testcerts/cert3.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python submitcert.py --store testcerts/cert4.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python submitcert.py --store testcerts/cert5.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python submitcert.py --store testcerts/pre1.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python submitcert.py --store testcerts/pre2.txt --check-sct --sct-file=../rel/submittedcerts https://127.0.0.1:8080/) || echo "Submission failed"
-	@(cd tools ; python 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) || echo "Merge failed"
+	@(cd rel && python ../tools/testcase1.py ) || (echo "Tests failed" ; false)
+	@(cd rel && python ../tools/fetchallcerts.py $(BASEURL)) || (echo "Verification failed" ; false)
+	@(cd rel && rm -f submittedcerts)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert1.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert2.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert3.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert4.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert5.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre1.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre2.txt --check-sct --sct-file=submittedcerts $(BASEURL)) || (echo "Submission failed" ; false)
+	@(cd rel && python ../tools/merge.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg || (echo "Merge failed" ; false)
 
 tests-run2:
-	@(cd tools ; python verifysct.py --sct-file=../rel/submittedcerts --parallel 1 https://127.0.0.1:8080/) || echo "Verification of SCT:s failed"
+	@(cd rel ; python ../tools/verifysct.py --sct-file=submittedcerts --parallel 1 $(BASEURL)) || echo "Verification of SCT:s failed"
 
 tests-stop:
 	@for node in $(NODES); do \
-	  ./tools/halt.py ./rel/bin/to_erl test/nodes/$$node/ ; \
+	  ./tools/halt.py to_erl test/nodes/$$node/ ; \
 	done
 
 tests-wait:
 	sleep 5
 
 tests:
+	tools/compileconfig.py --config=test/catlfish-test.cfg --testmakefile=test/test.mk --machines 1
 	@make tests-prepare
 	@make tests-start
-	@make tests-run
+	@make tests-run || (make tests-stop ; false)
 	@make tests-wait
 	@make tests-stop
 	@make tests-wait
 	@make tests-start
-	@make tests-run2
+	@make tests-run2 || (make tests-stop ; false)
 	@make tests-wait
 	@make tests-stop