letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update integration tests

This commit is contained in:
Roland Bracewell Shoemaker 2018-04-20 13:18:40 -07:00
parent ccb02419c5
commit 0a86573a73
19 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/config-next/admin-revoker.json
View File

@ -8,11 +8,11 @@
"keyFile": "test/grpc-creds/admin-revoker.boulder/key.pem"
},
"raService": {
"serverAddresses": ["ra.boulder:9094"],
"serverAddresses": ["ra.boulder:9094", "ra.boulder:9194"],
"timeout": "15s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
}
},

2
test/config-next/ca.json
View File

@ -11,7 +11,7 @@
"keyFile": "test/grpc-creds/ca.boulder/key.pem"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"grpcCA": {

2
test/config-next/expiration-mailer.json
View File

@ -18,7 +18,7 @@
"keyFile": "test/grpc-creds/expiration-mailer.boulder/key.pem"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"SMTPTrustedRootFile": "test/mail-test-srv/minica.pem",

6
test/config-next/ocsp-updater.json
View File

@ -23,15 +23,15 @@
"keyFile": "test/grpc-creds/ocsp-updater.boulder/key.pem"
},
"publisher": {
"serverAddresses": ["publisher.boulder:9091"],
"serverAddresses": ["publisher.boulder:9091", "publisher.boulder:9191"],
"timeout": "10s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"ocspGeneratorService": {
"serverAddresses": ["ca.boulder:9096"],
"serverAddresses": ["ca.boulder:9096", "ca.boulder:9196"],
"timeout": "15s"
},
"features": {

2
test/config-next/orphan-finder.json
View File

@ -12,7 +12,7 @@
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
}
}

2
test/config-next/publisher.json
View File

@ -17,7 +17,7 @@
"keyFile": "test/grpc-creds/publisher.boulder/key.pem"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"features": {

8
test/config-next/ra.json
View File

@ -23,19 +23,19 @@
"keyFile": "test/grpc-creds/ra.boulder/key.pem"
},
"vaService": {
"serverAddresses": ["va.boulder:9092"],
"serverAddresses": ["va.boulder:9092", "va.boulder:9192"],
"timeout": "20s"
},
"caService": {
"serverAddresses": ["ca.boulder:9093"],
"serverAddresses": ["ca.boulder:9093", "ca.boulder:9193"],
"timeout": "15s"
},
"publisherService": {
"serverAddresses": ["publisher.boulder:9091"],
"serverAddresses": ["publisher.boulder:9091", "publisher.boulder:9191"],
"timeout": "300s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"grpc": {

4
test/config-next/wfe.json
View File

@ -23,11 +23,11 @@
"keyFile": "test/grpc-creds/wfe.boulder/key.pem"
},
"raService": {
"serverAddresses": ["ra.boulder:9094"],
"serverAddresses": ["ra.boulder:9094", "ra.boulder:9194"],
"timeout": "20s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"features": {

4
test/config-next/wfe2.json
View File

@ -23,11 +23,11 @@
"keyFile": "test/grpc-creds/wfe.boulder/key.pem"
},
"raService": {
"serverAddresses": ["ra.boulder:9094"],
"serverAddresses": ["ra.boulder:9094", "ra.boulder:9194"],
"timeout": "15s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"certificateChains": {

4
test/config/admin-revoker.json
View File

@ -8,11 +8,11 @@
"keyFile": "test/grpc-creds/admin-revoker.boulder/key.pem"
},
"raService": {
"serverAddresses": ["ra.boulder:9094"],
"serverAddresses": ["ra.boulder:9094", "ra.boulder:9194"],
"timeout": "15s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
}
},

2
test/config/ca.json
View File

@ -11,7 +11,7 @@
"keyFile": "test/grpc-creds/ca.boulder/key.pem"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"grpcCA": {

2
test/config/expiration-mailer.json
View File

@ -18,7 +18,7 @@
"keyFile": "test/grpc-creds/expiration-mailer.boulder/key.pem"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"SMTPTrustedRootFile": "test/mail-test-srv/minica.pem",

6
test/config/ocsp-updater.json
View File

@ -23,15 +23,15 @@
"keyFile": "test/grpc-creds/ocsp-updater.boulder/key.pem"
},
"publisher": {
"serverAddresses": ["publisher.boulder:9091"],
"serverAddresses": ["publisher.boulder:9091", "publisher.boulder:9191"],
"timeout": "10s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"ocspGeneratorService": {
"serverAddresses": ["ca.boulder:9096"],
"serverAddresses": ["ca.boulder:9096", "ca.boulder:9196"],
"timeout": "15s"
}
},

2
test/config/orphan-finder.json
View File

@ -10,7 +10,7 @@
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
}
}

2
test/config/publisher.json
View File

@ -16,7 +16,7 @@
"keyFile": "test/grpc-creds/publisher.boulder/key.pem"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
}
},

8
test/config/ra.json
View File

@ -19,19 +19,19 @@
"keyFile": "test/grpc-creds/ra.boulder/key.pem"
},
"vaService": {
"serverAddresses": ["va.boulder:9092"],
"serverAddresses": ["va.boulder:9092", "va.boulder:9192"],
"timeout": "20s"
},
"caService": {
"serverAddresses": ["ca.boulder:9093"],
"serverAddresses": ["ca.boulder:9093", "ca.boulder:9193"],
"timeout": "15s"
},
"publisherService": {
"serverAddresses": ["publisher.boulder:9091"],
"serverAddresses": ["publisher.boulder:9091", "publisher.boulder:9191"],
"timeout": "15s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"grpc": {

4
test/config/wfe.json
View File

@ -22,11 +22,11 @@
"keyFile": "test/grpc-creds/wfe.boulder/key.pem"
},
"raService": {
"serverAddresses": ["ra.boulder:9094"],
"serverAddresses": ["ra.boulder:9094", "ra.boulder:9194"],
"timeout": "20s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"features": {

4
test/config/wfe2.json
View File

@ -22,11 +22,11 @@
"keyFile": "test/grpc-creds/wfe.boulder/key.pem"
},
"raService": {
"serverAddresses": ["ra.boulder:9094"],
"serverAddresses": ["ra.boulder:9094", "ra.boulder:9194"],
"timeout": "15s"
},
"saService": {
"serverAddresses": ["sa.boulder:9095"],
"serverAddresses": ["sa.boulder:9095", "sa.boulder:9195"],
"timeout": "15s"
},
"features": {}

15
test/startservers.py
View File

@ -79,19 +79,24 @@ def start(race_detection, fakeclock=None):
[8012, 'boulder-va --config %s' % os.path.join(default_config_dir, "va-remote-b.json")],
])
progs.extend([
[8003, 'boulder-sa --config %s' % os.path.join(default_config_dir, "sa.json")],
[8003, 'boulder-sa --config %s --grpc-addr :9095 --debug-addr :8003' % os.path.join(default_config_dir, "sa.json")],
[8103, 'boulder-sa --config %s --grpc-addr :9195 --debug-addr :8103' % os.path.join(default_config_dir, "sa.json")],
[4500, 'ct-test-srv --config test/ct-test-srv/ct-test-srv.json'],
[8009, 'boulder-publisher --config %s' % os.path.join(default_config_dir, "publisher.json")],
[8009, 'boulder-publisher --config %s --grpc-addr :9091 --debug-addr :8009' % os.path.join(default_config_dir, "publisher.json")],
[8109, 'boulder-publisher --config %s --grpc-addr :9191 --debug-addr :8109' % os.path.join(default_config_dir, "publisher.json")],
[9380, 'mail-test-srv --closeFirst 5 --cert test/mail-test-srv/localhost/cert.pem --key test/mail-test-srv/localhost/key.pem'],
[8005, 'ocsp-responder --config %s' % os.path.join(default_config_dir, "ocsp-responder.json")],
# The gsb-test-srv needs to be started before the VA or its intial DB
# update will fail and all subsequent lookups will be invalid
[6000, 'gsb-test-srv -apikey my-voice-is-my-passport'],
[8055, 'dns-test-srv'],
[8004, 'boulder-va --config %s' % os.path.join(default_config_dir, "va.json")],
[8001, 'boulder-ca --config %s' % os.path.join(default_config_dir, "ca.json")],
[8004, 'boulder-va --config %s --grpc-addr :9092 --debug-addr :8004' % os.path.join(default_config_dir, "va.json")],
[8104, 'boulder-va --config %s --grpc-addr :9192 --debug-addr :8104' % os.path.join(default_config_dir, "va.json")],
[8001, 'boulder-ca --config %s --ca-grpc-addr :9093 --ocsp-grpc-addr :9096 --debug-addr :8001' % os.path.join(default_config_dir, "ca.json")],
[8101, 'boulder-ca --config %s --ca-grpc-addr :9193 --ocsp-grpc-addr :9196 --debug-addr :8101' % os.path.join(default_config_dir, "ca.json")],
[8006, 'ocsp-updater --config %s' % os.path.join(default_config_dir, "ocsp-updater.json")],
[8002, 'boulder-ra --config %s' % os.path.join(default_config_dir, "ra.json")],
[8002, 'boulder-ra --config %s --grpc-addr :9094 --debug-addr :8002' % os.path.join(default_config_dir, "ra.json")],
[8102, 'boulder-ra --config %s --grpc-addr :9194 --debug-addr :8102' % os.path.join(default_config_dir, "ra.json")],
[4431, 'boulder-wfe2 --config %s' % os.path.join(default_config_dir, "wfe2.json")],
[4000, 'boulder-wfe --config %s' % os.path.join(default_config_dir, "wfe.json")],
])