Merge pull request #144 from testcontainers/fix/panic-hostport

Fix panic in wait host port
testcontainers · Feb 5, 2020 · fc5599f · fc5599f
2 parents c0c9a5c + bb1c462
commit fc5599f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/wait/host_port.go b/wait/host_port.go
@@ -3,13 +3,14 @@ package wait
 import (
 	"context"
 	"fmt"
-	"github.com/pkg/errors"
 	"net"
 	"os"
 	"strconv"
 	"syscall"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/docker/go-connections/nat"
 )
 
@@ -70,6 +71,9 @@ func (hp *HostPortStrategy) WaitUntilReady(ctx context.Context, target StrategyT
 	address := net.JoinHostPort(ipAddress, portString)
 	for {
 		conn, err := dialer.DialContext(ctx, proto, address)
+		if err != nil {
+			return err
+		}
 		defer conn.Close()
 		if err != nil {
 			if v, ok := err.(*net.OpError); ok {