1
0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-19 14:57:04 +00:00

smtpsrv: Allow manual override of submission+TLS port in tests

The smtpsrv server tests allow manual override of testing ports via
flags, but the submission+TLS port was missing (accidental oversight).
This commit is contained in:
Alberto Bertogli
2019-11-30 11:37:11 +00:00
parent ac2c5ab4db
commit d0f65881c9

View File

@@ -28,6 +28,8 @@ var (
"SMTP server address to test (defaults to use internal)") "SMTP server address to test (defaults to use internal)")
externalSubmissionAddr = flag.String("external_submission_addr", "", externalSubmissionAddr = flag.String("external_submission_addr", "",
"submission server address to test (defaults to use internal)") "submission server address to test (defaults to use internal)")
externalSubmissionTLSAddr = flag.String("external_submission_tls_addr", "",
"submission+TLS server address to test (defaults to use internal)")
) )
var ( var (
@@ -449,6 +451,7 @@ func realMain(m *testing.M) int {
if *externalSMTPAddr != "" { if *externalSMTPAddr != "" {
smtpAddr = *externalSMTPAddr smtpAddr = *externalSMTPAddr
submissionAddr = *externalSubmissionAddr submissionAddr = *externalSubmissionAddr
submissionTLSAddr = *externalSubmissionTLSAddr
tlsConfig = &tls.Config{ tlsConfig = &tls.Config{
InsecureSkipVerify: true, InsecureSkipVerify: true,
} }
@@ -495,6 +498,7 @@ func realMain(m *testing.M) int {
waitForServer(smtpAddr) waitForServer(smtpAddr)
waitForServer(submissionAddr) waitForServer(submissionAddr)
waitForServer(submissionTLSAddr)
return m.Run() return m.Run()
} }