chore: improve freeport usage

router-tests/testenv/testenv.go

@@ -478,10 +478,6 @@ func CreateTestSupervisorEnv(t testing.TB, cfg *Config) (*Environment, error) {
 		Countries:    atomic.NewInt64(0),
 	}
 
-	requiredPorts := 2
-
-	ports := freeport.GetN(t, requiredPorts)
-
 	getPubSubName := GetPubSubNameFn(pubSubPrefix)
 
 	ctx, cancel := context.WithCancelCause(context.Background())
@@ -637,6 +633,9 @@ func CreateTestSupervisorEnv(t testing.TB, cfg *Config) (*Environment, error) {
 		cdnServer = SetupCDNServer(t, freeport.GetOne(t))
 	}
 
+	requiredPorts := 2
+	ports := freeport.GetN(t, requiredPorts)
+
 	if cfg.PrometheusRegistry != nil {
 		cfg.PrometheusPort = ports[0]
 	}

router-tests/testenv/waitinglistener.go

@@ -2,10 +2,12 @@ package testenv
 
 import (
 	"context"
+	"fmt"
 	"net"
 	"testing"
 	"time"
 
+	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/stretchr/testify/require"
 )
 
@@ -41,7 +43,7 @@ func (l *WaitingListener) Port() int {
 func NewWaitingListener(t *testing.T, waitTime time.Duration) (wl *WaitingListener) {
 	ctx, cancel := context.WithCancel(context.Background())
 	var lc net.ListenConfig
-	listener, err := lc.Listen(ctx, "tcp", "127.0.0.1:0")
+	listener, err := lc.Listen(ctx, "tcp", fmt.Sprintf("127.0.0.1:%d", freeport.GetOne(t)))
 	require.NoError(t, err)
 
 	wl = &WaitingListener{