netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix flaky link resolution test.

Browse Source 
mointorableEndpoint was flaking because of a race between the
pending packet from the failed write and the new write. We don't
actually need the new write to show that link resolution worked.

PiperOrigin-RevId: 502699348
This commit is contained in:
Lucas Manning
2023-01-17 15:08:27 -08:00
committed by gVisor bot
parent 1ae11b17a9
commit d3c86781ab
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tcpip/tests/integration/link_resolution_test.go
+4 -5
View File
@@ -1828,7 +1828,7 @@ func TestUpdateCachedNeighborEntry(t *testing.T) {
// Send packet to neighbor (start link resolution & resolve, then send
// packet). Send twice to use cached address the second time.
for i := 0; i < 2; i++ {
writePacket(t, r)
go writePacket(t, r)
if err := host1NICMonitorable.waitForLinkAddress(utils.LinkAddr2, time.Second); err != nil {
t.Fatalf("host1NIC.waitForLinkAddress(%s): %s", utils.LinkAddr2, err)
}
@@ -1838,8 +1838,8 @@ func TestUpdateCachedNeighborEntry(t *testing.T) {
host1Stack.RemoveNeighbor(host1NICID, header.IPv4ProtocolNumber, neighborAddr)
host2Stack.DisableNIC(host2NICID)
// Send packet to neighbor that's no longer reachable (should fail).
writePacket(t, r)
// Send a packet to the neighbor that's no longer reachable (should fail).
go writePacket(t, r)
if err := host1NICMonitorable.waitForLinkAddress(utils.LinkAddr2, time.Second); err == nil {
t.Fatalf("got host1NIC.waitForLinkAddress(%s) = nil, want err", utils.LinkAddr2)
}
@@ -1848,8 +1848,7 @@ func TestUpdateCachedNeighborEntry(t *testing.T) {
host2Stack.EnableNIC(host2NICID)
host2NICSettable.setLinkAddress(utils.LinkAddr3)
// Send packet to neighbor (start link resolution and then send packet).
writePacket(t, r)
// Pending packet should eventually reach the new neighbor.
if err := host1NICMonitorable.waitForLinkAddress(utils.LinkAddr3, 5*time.Second); err != nil {
t.Fatalf("host1NIC.waitForLinkAddress(%s): %s", utils.LinkAddr3, err)
}