bug: fix unit tests

Author: taciturnaxolotl

services/mail/smtp_test.go

@@ -28,11 +28,12 @@ import (
 )
 
 const (
-	TestSmtpUser   = "admin"
-	TestSmtpPass   = "admin"
-	Smtp4DevApiUrl = "http://localhost:8080/api"
-	Smtp4DevHost   = "localhost"
-	Smtp4DevPort   = 2525
+	TestSmtpUser      = "admin"
+	TestSmtpPass      = "admin"
+	Smtp4DevApiUrl    = "http://localhost:8080/api"
+	Smtp4DevHost      = "localhost"
+	Smtp4DevPort      = 2525
+	Smtp4DevTlsPort   = 2465
 )
 
 type SmtpTestSuite struct {
@@ -89,6 +90,7 @@ func (suite *SmtpTestSuite) TestSMTPSendingService_SendTLS() {
 	}
 
 	cfg := createDefaultSMTPConfig()
+	cfg.Port = Smtp4DevTlsPort
 	cfg.TLS = true
 
 	sut := NewSMTPSendingService(cfg)
@@ -215,22 +217,22 @@ func (c *Smtp4DevClient) CountMessages() (int, error) {
 
 func (c *Smtp4DevClient) SetNoTls() error {
 	slog.Info("[smtp4Dev] disabling tls encryption")
-	err := c.SetConfigValue("tlsMode", "None")
-	time.Sleep(2 * time.Second)
+	err := c.SetConfigValue("ServerOptions__TlsMode", "None")
+	time.Sleep(5 * time.Second)
 	return err
 }
 
 func (c *Smtp4DevClient) SetForcedTls() error {
 	slog.Info("[smtp4Dev] enabling forced tls encryption")
-	err := c.SetConfigValue("tlsMode", "ImplicitTls")
-	time.Sleep(2 * time.Second)
+	err := c.SetConfigValue("ServerOptions__TlsMode", "ImplicitTls")
+	time.Sleep(5 * time.Second)
 	return err
 }
 
 func (c *Smtp4DevClient) SetStartTls() error {
 	slog.Info("[smtp4Dev] enabling tls encryption via starttls")
-	err := c.SetConfigValue("tlsMode", "StartTls")
-	time.Sleep(2 * time.Second)
+	err := c.SetConfigValue("ServerOptions__TlsMode", "StartTls")
+	time.Sleep(5 * time.Second)
 	return err
 }
 

testing/run_mail_tests.sh

@@ -11,7 +11,7 @@ trap cleanup EXIT
 cleanup
 
 echo "Starting smtp4dev in Docker ..."
-docker run -d --rm -p 2525:25 -p 8080:80 --name smtp4dev_wakapi rnwood/smtp4dev
+docker run -d --rm -p 2525:25 -p 2465:465 -p 8080:80 --name smtp4dev_wakapi rnwood/smtp4dev
 
 echo "Running tests ..."
 script_dir=$(dirname "${BASH_SOURCE[0]}")