From f70a0c8d52450e0877cba57df7af1e6e71e3bc14 Mon Sep 17 00:00:00 2001 From: Christian Joergensen Date: Wed, 26 Sep 2018 21:22:28 +0200 Subject: [PATCH] Removing personal e-mail from comments and tests. --- protocol.go | 4 ++-- protocol_test.go | 8 ++++---- smtpd_test.go | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/protocol.go b/protocol.go index bf6c427..d8a3297 100644 --- a/protocol.go +++ b/protocol.go @@ -36,11 +36,11 @@ func parseLine(line string) (cmd command) { // Account for some clients breaking the standard and having // an extra whitespace after the ':' character. Example: // - // MAIL FROM: + // MAIL FROM: // // Should be: // - // MAIL FROM: + // MAIL FROM: // // Thus, we add a check if the second field ends with ':' // and appends the rest of the third field. diff --git a/protocol_test.go b/protocol_test.go index aa04b70..50dc04e 100644 --- a/protocol_test.go +++ b/protocol_test.go @@ -34,7 +34,7 @@ func TestParseLine(t *testing.T) { t.Fatalf("unexpected params: %v", cmd.params) } - cmd = parseLine("MAIL FROM:") + cmd = parseLine("MAIL FROM:") if cmd.action != "MAIL" { t.Fatalf("unexpected action: %s", cmd.action) } @@ -51,7 +51,7 @@ func TestParseLine(t *testing.T) { t.Fatalf("unexpected value for param 0: %v", cmd.params[0]) } - if cmd.params[1] != "" { + if cmd.params[1] != "" { t.Fatalf("unexpected value for param 1: %v", cmd.params[1]) } @@ -59,7 +59,7 @@ func TestParseLine(t *testing.T) { func TestParseLineMailformedMAILFROM(t *testing.T) { - cmd := parseLine("MAIL FROM: ") + cmd := parseLine("MAIL FROM: ") if cmd.action != "MAIL" { t.Fatalf("unexpected action: %s", cmd.action) } @@ -76,7 +76,7 @@ func TestParseLineMailformedMAILFROM(t *testing.T) { t.Fatalf("unexpected value for param 0: %v", cmd.params[0]) } - if cmd.params[1] != "" { + if cmd.params[1] != "" { t.Fatalf("unexpected value for param 1: %v", cmd.params[1]) } diff --git a/smtpd_test.go b/smtpd_test.go index 8d7ae70..3cc134f 100644 --- a/smtpd_test.go +++ b/smtpd_test.go @@ -1002,7 +1002,7 @@ func TestHELO(t *testing.T) { t.Fatalf("Dial failed: %v", err) } - if err := cmd(c.Text, 502, "MAIL FROM:"); err != nil { + if err := cmd(c.Text, 502, "MAIL FROM:"); err != nil { t.Fatalf("MAIL before HELO didn't fail: %v", err) } @@ -1010,7 +1010,7 @@ func TestHELO(t *testing.T) { t.Fatalf("HELO failed: %v", err) } - if err := cmd(c.Text, 250, "MAIL FROM:"); err != nil { + if err := cmd(c.Text, 250, "MAIL FROM:"); err != nil { t.Fatalf("MAIL after HELO failed: %v", err) } @@ -1119,7 +1119,7 @@ func TestNoBracketsSender(t *testing.T) { t.Fatalf("HELO failed: %v", err) } - if err := cmd(c.Text, 250, "MAIL FROM:christian@technobabble.dk"); err != nil { + if err := cmd(c.Text, 250, "MAIL FROM:test@example.org"); err != nil { t.Fatalf("MAIL without brackets failed: %v", err) } @@ -1211,7 +1211,7 @@ func TestMailformedMAILFROM(t *testing.T) { addr, closer := runserver(t, &smtpd.Server{ SenderChecker: func(peer smtpd.Peer, addr string) error { - if addr != "christian@technobabble.dk" { + if addr != "test@example.org" { return smtpd.Error{Code: 502, Message: "Denied"} } return nil @@ -1229,7 +1229,7 @@ func TestMailformedMAILFROM(t *testing.T) { t.Fatalf("HELO failed: %v", err) } - if err := cmd(c.Text, 250, "MAIL FROM: "); err != nil { + if err := cmd(c.Text, 250, "MAIL FROM: "); err != nil { t.Fatalf("MAIL FROM failed with extra whitespace: %v", err) }