diff --git a/integration/route_test.go b/integration/route_test.go index 2ca0c10e..47875f7c 100644 --- a/integration/route_test.go +++ b/integration/route_test.go @@ -7,6 +7,8 @@ import ( "testing" "time" + "slices" + "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" v1 "github.com/juanfont/headscale/gen/go/headscale/v1" @@ -1533,6 +1535,7 @@ func TestSubnetRouterMultiNetworkExitNode(t *testing.T) { err = user2c.Ping(webip.String(), tsic.WithPingUntilDirect(false), tsic.WithPingCount(1), + tsic.WithPingTimeout(7*time.Second), ) require.NoError(t, err) } @@ -1563,13 +1566,7 @@ func requirePeerSubnetRoutes(t *testing.T, status *ipnstate.PeerStatus, expected if tsaddr.IsExitRoute(p) { return true } - for _, ip := range status.TailscaleIPs { - if p.Contains(ip) { - return false - } - } - - return true + return !slices.ContainsFunc(status.TailscaleIPs, p.Contains) }) if diff := cmp.Diff(expected, got, util.PrefixComparer, cmpopts.EquateEmpty()); diff != "" { diff --git a/integration/tsic/tsic.go b/integration/tsic/tsic.go index f29d7b9c..0c8ba734 100644 --- a/integration/tsic/tsic.go +++ b/integration/tsic/tsic.go @@ -1014,6 +1014,7 @@ func (t *TailscaleInContainer) Ping(hostnameOrIP string, opts ...PingOption) err ), ) if err != nil { + log.Printf("command: %v", command) log.Printf( "failed to run ping command from %s to %s, err: %s", t.Hostname(),