test: wait for envoy port

1 files changed, 5 insertions, 3 deletions

diff --git a/test/integration/container.go b/test/integration/container.go
index c500edc..94c6e42 100644
--- a/test/integration/container.go
+++ b/test/integration/container.go
@@ -7,14 +7,15 @@ import (
 	"strconv"
 	"strings"
 	"testing"
-	"time"
 
 	xcontainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
+	"github.com/docker/go-connections/nat"
 	"github.com/stretchr/testify/require"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 	"github.com/xlgmokha/x/pkg/env"
+	"github.com/xlgmokha/x/pkg/x"
 )
 
 func normalizeIssuer(t *testing.T, issuer string) (string, int) {
@@ -45,10 +46,11 @@ func containerOptions(t *testing.T, envVars map[string]string) []testcontainers.
 	options := []testcontainers.ContainerCustomizer{
 		testcontainers.WithEnv(envVars),
 		testcontainers.WithLogConsumers(&LogConsumer{t: t}),
-		testcontainers.WithWaitStrategy(wait.ForLog("Listening on").WithStartupTimeout(10 * time.Second)),
+		// testcontainers.WithWaitStrategy(wait.ForLog("Listening on").WithStartupTimeout(10 * time.Second)),
+		testcontainers.WithWaitStrategy(wait.ForListeningPort(x.Must(nat.NewPort("tcp", "10000")))),
 	}
 
-	if isGitlabCI() {
+	if isGitlabCI(t) {
 		options = append(options, testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) {
 			cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost)
 		}))