mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

target: Fix tests to use support go-smtp

Browse source
This commit is contained in:
fox.cpp 2023-02-05 16:37:24 +03:00
parent 1db37f91b1
commit 0c534f5231
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
3 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/target/remote/remote_test.go
View file

@ -982,7 +982,8 @@ func TestRemoteDelivery_TLS_FallbackNoVerify(t *testing.T) {
be.CheckMsg(t, 0, "test@example.com", []string{"test@example.invalid"})
// But it should still be delivered over TLS.
if !be.Messages[0].State.TLS.HandshakeComplete {
tlsState, ok := be.Messages[0].Conn.TLSConnectionState()
if !ok || !tlsState.HandshakeComplete {
t.Fatal("Message was not delivered over TLS")
}
}

16
internal/target/smtp/smtp_downstream_test.go
View file

@ -229,8 +229,10 @@ func TestDownstreamDelivery_AttemptTLS(t *testing.T) {
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
be.CheckMsg(t, 0, "test@example.invalid", []string{"rcpt@example.invalid"})
if !be.Messages[0].State.TLS.HandshakeComplete {
t.Error("Expected TLS to be used, but it was not")
tlsState, ok := be.Messages[0].Conn.TLSConnectionState()
if !ok || !tlsState.HandshakeComplete {
t.Fatal("Message was not delivered over TLS")
}
}
@ -278,8 +280,9 @@ func TestDownstreamDelivery_RequireTLS(t *testing.T) {
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
be.CheckMsg(t, 0, "test@example.invalid", []string{"rcpt@example.invalid"})
if !be.Messages[0].State.TLS.HandshakeComplete {
t.Error("Expected TLS to be used, but it was not")
tlsState, ok := be.Messages[0].Conn.TLSConnectionState()
if !ok || !tlsState.HandshakeComplete {
t.Fatal("Message was not delivered over TLS")
}
}
@ -305,8 +308,9 @@ func TestDownstreamDelivery_RequireTLS_Implicit(t *testing.T) {
testutils.DoTestDelivery(t, mod, "test@example.invalid", []string{"rcpt@example.invalid"})
be.CheckMsg(t, 0, "test@example.invalid", []string{"rcpt@example.invalid"})
if !be.Messages[0].State.TLS.HandshakeComplete {
t.Error("Expected TLS to be used, but it was not")
tlsState, ok := be.Messages[0].Conn.TLSConnectionState()
if !ok || !tlsState.HandshakeComplete {
t.Fatal("Message was not delivered over TLS")
}
}

2
internal/target/smtp/smtputf8_test.go
View file

@ -51,7 +51,7 @@ func TestDownstreamDelivery_EHLO_ALabel(t *testing.T) {
testutils.DoTestDelivery(t, tgt, "test@example.com", []string{"test@example.invalid"})
be.CheckMsg(t, 0, "test@example.com", []string{"test@example.invalid"})
if be.Messages[0].State.Hostname != "xn--e1aybc.invalid" {
if be.Messages[0].Conn.Hostname() != "xn--e1aybc.invalid" {
t.Error("target/remote should use use Punycode in EHLO")
}
}