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

tests: Force a certain rDNS name for 127.0.0.1

Browse source 
Should make tests independent of what system has configured for it
This commit is contained in:
fox.cpp 2021-07-10 21:45:15 +03:00
parent 20c9991244
commit 5c6fba8e7c
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/imapsql_test.go
View file

@ -100,7 +100,7 @@ func TestImapsqlDelivery(tt *testing.T) {
imapConn.ExpectPattern(`\* 1 FETCH (BODY\[\] {*}*`)
imapConn.Expect(`Delivered-To: testusr@maddy.test`)
imapConn.Expect(`Return-Path: <sender@maddy.test>`)
imapConn.ExpectPattern(`Received: from localhost (* \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(`Received: from localhost (localhost \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(` (envelope-sender <sender@maddy.test>) with ESMTP id *; *`)
imapConn.ExpectPattern(` *`)
imapConn.Expect("From: <sender@maddy.test>")

8
tests/smtp_autobuffer_test.go
View file

@ -100,7 +100,7 @@ func TestSMTPEndpoint_FileBuffer(tt *testing.T) {
imapConn.ExpectPattern(`\* 1 FETCH (BODY\[\] {*}*`)
imapConn.Expect(`Delivered-To: testusr@maddy.test`)
imapConn.Expect(`Return-Path: <sender@maddy.test>`)
imapConn.ExpectPattern(`Received: from localhost (* \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(`Received: from localhost (localhost \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(` (envelope-sender <sender@maddy.test>) with ESMTP id *; *`)
imapConn.ExpectPattern(` *`)
imapConn.Expect("From: <sender@maddy.test>")
@ -218,7 +218,7 @@ func TestSMTPEndpoint_Autobuffer(tt *testing.T) {
imapConn.ExpectPattern(`\* 1 FETCH (BODY\[\] {*}*`)
imapConn.Expect(`Delivered-To: testusr@maddy.test`)
imapConn.Expect(`Return-Path: <sender@maddy.test>`)
imapConn.ExpectPattern(`Received: from localhost (* \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(`Received: from localhost (localhost \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(` (envelope-sender <sender@maddy.test>) with ESMTP id *; *`)
imapConn.ExpectPattern(` *`)
imapConn.Expect("From: <sender@maddy.test>")
@ -230,7 +230,7 @@ func TestSMTPEndpoint_Autobuffer(tt *testing.T) {
imapConn.ExpectPattern(`\* 2 FETCH (BODY\[\] {*}*`)
imapConn.Expect(`Delivered-To: testusr@maddy.test`)
imapConn.Expect(`Return-Path: <sender@maddy.test>`)
imapConn.ExpectPattern(`Received: from localhost (* \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(`Received: from localhost (localhost \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(` (envelope-sender <sender@maddy.test>) with ESMTP id *; *`)
imapConn.ExpectPattern(` *`)
imapConn.Expect("From: <sender@maddy.test>")
@ -241,7 +241,7 @@ func TestSMTPEndpoint_Autobuffer(tt *testing.T) {
imapConn.ExpectPattern(`\* 3 FETCH (BODY\[\] {*}*`)
imapConn.Expect(`Delivered-To: testusr@maddy.test`)
imapConn.Expect(`Return-Path: <sender@maddy.test>`)
imapConn.ExpectPattern(`Received: from localhost (* \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(`Received: from localhost (localhost \[127.0.0.1\]) by maddy.test`)
imapConn.ExpectPattern(` (envelope-sender <sender@maddy.test>) with ESMTP id *; *`)
imapConn.ExpectPattern(` *`)
imapConn.Expect("From: <sender@maddy.test>")

7
tests/t.go
View file

@ -88,6 +88,13 @@ func (t *T) Config(cfg string) {
func (t *T) DNS(zones map[string]mockdns.Zone) {
t.Helper()
if zones == nil {
zones = map[string]mockdns.Zone{}
}
if _, ok := zones["1.0.0.127.in-addr.arpa."]; !ok {
zones["1.0.0.127.in-addr.arpa."] = mockdns.Zone{PTR: []string{"localhost"}}
}
if t.dnsServ != nil {
t.Log("NOTE: Multiple DNS calls, replacing the server instance...")
t.dnsServ.Close()