Skip to content

Commit

Permalink
[mq] working branch - merge 0ac1ec5 on top of main at 3de13d4
Browse files Browse the repository at this point in the history
{"baseBranch":"main","baseCommit":"3de13d496558a5a6b3d240b97b33b9caa57c2472","createdAt":"2024-01-23T21:51:03.621570Z","headSha":"0ac1ec5ced029444f67d871aadfc1f0aa6fb19fd","id":"f0ec966e-2cdd-4a50-b275-9c4f5abf6176","priority":"200","pullRequestNumber":"22291","queuedAt":"2024-01-23T21:51:03.621164Z","status":"STATUS_QUEUED"}
  • Loading branch information
dd-mergequeue[bot] authored Jan 23, 2024
2 parents 712ac81 + 0ac1ec5 commit 4cf9754
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions pkg/network/tracer/tracer_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -847,9 +847,11 @@ func (s *TracerSuite) TestGatewayLookupCrossNamespace() {

require.Eventually(t, func() bool {
var ok bool
conn, ok = findConnection(c.LocalAddr(), c.RemoteAddr(), getConnections(t, tr))
conns := getConnections(t, tr)
t.Log(conns)
conn, ok = findConnection(c.LocalAddr(), c.RemoteAddr(), conns)
return ok && conn.Direction == network.OUTGOING
}, 2*time.Second, 500*time.Millisecond)
}, 3*time.Second, 100*time.Millisecond)

// conn.Via should be nil, since traffic is local
require.Nil(t, conn.Via)
Expand Down Expand Up @@ -877,9 +879,11 @@ func (s *TracerSuite) TestGatewayLookupCrossNamespace() {
var conn *network.ConnectionStats
require.Eventually(t, func() bool {
var ok bool
conn, ok = findConnection(c.LocalAddr(), c.RemoteAddr(), getConnections(t, tr))
conns := getConnections(t, tr)
t.Log(conns)
conn, ok = findConnection(c.LocalAddr(), c.RemoteAddr(), conns)
return ok && conn.Direction == network.OUTGOING
}, 2*time.Second, 500*time.Millisecond)
}, 3*time.Second, 100*time.Millisecond)

// traffic is local, so Via field should not be set
require.Nil(t, conn.Via)
Expand Down

0 comments on commit 4cf9754

Please sign in to comment.