Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"os"
"os/exec"
"reflect"
"runtime"
"strings"
"sync"
"syscall"
Expand Down Expand Up @@ -437,6 +438,9 @@ func TestApp_Run_ReturnsStartError(t *testing.T) {
// Run; the parent signals only after the SMTP port accepts a connection.
func testRunShutsDownOnSignal(t *testing.T, sig syscall.Signal) {
t.Helper()
if runtime.GOOS == "windows" {
t.Skip("Windows cannot deliver SIGINT or SIGTERM to a child process")
}

if os.Getenv("INBOUNDPARSE_RUN_SIGNAL_CHILD") == "1" {
serveUntilShutdownSignal(t)
Expand Down
5 changes: 3 additions & 2 deletions internal/smtp/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,9 @@ func TestSMTPServer_Start_PlainBindFailureReturns(t *testing.T) {
if startErr == nil {
t.Fatal("expected Start() to return the plain bind error")
}
if !strings.Contains(startErr.Error(), "address already in use") {
t.Fatalf("Start() error = %v, want address already in use", startErr)
msg := startErr.Error()
if !strings.Contains(msg, "address already in use") && !strings.Contains(msg, "Only one usage of each socket address") {
t.Fatalf("Start() error = %v, want a bind conflict", startErr)
}

ln, listenErr := net.Listen("tcp", tlsAddr)
Expand Down
Loading