diff options
Diffstat (limited to 'pkg/tcpip/tests/integration')
-rw-r--r-- | pkg/tcpip/tests/integration/forward_test.go | 4 | ||||
-rw-r--r-- | pkg/tcpip/tests/integration/link_resolution_test.go | 22 | ||||
-rw-r--r-- | pkg/tcpip/tests/integration/loopback_test.go | 2 | ||||
-rw-r--r-- | pkg/tcpip/tests/integration/multicast_broadcast_test.go | 2 | ||||
-rw-r--r-- | pkg/tcpip/tests/integration/route_test.go | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/pkg/tcpip/tests/integration/forward_test.go b/pkg/tcpip/tests/integration/forward_test.go index 38c2f321b..d10ae05c2 100644 --- a/pkg/tcpip/tests/integration/forward_test.go +++ b/pkg/tcpip/tests/integration/forward_test.go @@ -48,7 +48,7 @@ func TestForwarding(t *testing.T) { t.Helper() var wq waiter.Queue we, ch := waiter.NewChannelEntry(nil) - wq.EventRegister(&we, waiter.EventIn) + wq.EventRegister(&we, waiter.ReadableEvents) ep, err := s.NewEndpoint(transProto, netProto, &wq) if err != nil { t.Fatalf("s.NewEndpoint(%d, %d, _): %s", transProto, netProto, err) @@ -184,7 +184,7 @@ func TestForwarding(t *testing.T) { } we, newCH := waiter.NewChannelEntry(nil) - wq.EventRegister(&we, waiter.EventIn) + wq.EventRegister(&we, waiter.ReadableEvents) return newEP, newCH } }, diff --git a/pkg/tcpip/tests/integration/link_resolution_test.go b/pkg/tcpip/tests/integration/link_resolution_test.go index 095623789..d39809e1c 100644 --- a/pkg/tcpip/tests/integration/link_resolution_test.go +++ b/pkg/tcpip/tests/integration/link_resolution_test.go @@ -151,7 +151,7 @@ func TestPing(t *testing.T) { var wq waiter.Queue we, waiterCH := waiter.NewChannelEntry(nil) - wq.EventRegister(&we, waiter.EventIn) + wq.EventRegister(&we, waiter.ReadableEvents) ep, err := host1Stack.NewEndpoint(test.transProto, test.netProto, &wq) if err != nil { t.Fatalf("host1Stack.NewEndpoint(%d, %d, _): %s", test.transProto, test.netProto, err) @@ -308,7 +308,7 @@ func TestTCPLinkResolutionFailure(t *testing.T) { var clientWQ waiter.Queue we, ch := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&we, waiter.EventOut|waiter.EventErr) + clientWQ.EventRegister(&we, waiter.WritableEvents|waiter.EventErr) clientEP, err := host1Stack.NewEndpoint(tcp.ProtocolNumber, test.netProto, &clientWQ) if err != nil { t.Fatalf("host1Stack.NewEndpoint(%d, %d, _): %s", tcp.ProtocolNumber, test.netProto, err) @@ -641,7 +641,7 @@ func TestWritePacketsLinkResolution(t *testing.T) { var serverWQ waiter.Queue serverWE, serverCH := waiter.NewChannelEntry(nil) - serverWQ.EventRegister(&serverWE, waiter.EventIn) + serverWQ.EventRegister(&serverWE, waiter.ReadableEvents) serverEP, err := host2Stack.NewEndpoint(udp.ProtocolNumber, test.netProto, &serverWQ) if err != nil { t.Fatalf("host2Stack.NewEndpoint(%d, %d, _): %s", udp.ProtocolNumber, test.netProto, err) @@ -821,7 +821,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := host1Stack.NewEndpoint(tcp.ProtocolNumber, ipv4.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -845,7 +845,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := host1Stack.NewEndpoint(tcp.ProtocolNumber, ipv6.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -869,7 +869,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := host1Stack.NewEndpoint(tcp.ProtocolNumber, ipv4.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -893,7 +893,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := host1Stack.NewEndpoint(tcp.ProtocolNumber, ipv6.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -917,7 +917,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := routerStack.NewEndpoint(tcp.ProtocolNumber, ipv4.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -942,7 +942,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := routerStack.NewEndpoint(tcp.ProtocolNumber, ipv6.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -967,7 +967,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := host2Stack.NewEndpoint(tcp.ProtocolNumber, ipv4.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() @@ -992,7 +992,7 @@ func TestTCPConfirmNeighborReachability(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventOut) + clientWQ.EventRegister(&clientWE, waiter.WritableEvents) clientEP, err := host2Stack.NewEndpoint(tcp.ProtocolNumber, ipv6.ProtocolNumber, &clientWQ) if err != nil { listenerEP.Close() diff --git a/pkg/tcpip/tests/integration/loopback_test.go b/pkg/tcpip/tests/integration/loopback_test.go index 6462e9d42..2c538a43e 100644 --- a/pkg/tcpip/tests/integration/loopback_test.go +++ b/pkg/tcpip/tests/integration/loopback_test.go @@ -449,7 +449,7 @@ func TestLoopbackAcceptAllInSubnetTCP(t *testing.T) { var wq waiter.Queue we, ch := waiter.NewChannelEntry(nil) - wq.EventRegister(&we, waiter.EventIn) + wq.EventRegister(&we, waiter.ReadableEvents) defer wq.EventUnregister(&we) listeningEndpoint, err := s.NewEndpoint(tcp.ProtocolNumber, test.addAddress.Protocol, &wq) if err != nil { diff --git a/pkg/tcpip/tests/integration/multicast_broadcast_test.go b/pkg/tcpip/tests/integration/multicast_broadcast_test.go index 77f4a88ec..c6a9c2393 100644 --- a/pkg/tcpip/tests/integration/multicast_broadcast_test.go +++ b/pkg/tcpip/tests/integration/multicast_broadcast_test.go @@ -498,7 +498,7 @@ func TestReuseAddrAndBroadcast(t *testing.T) { for i := 0; i < 2; i++ { var wq waiter.Queue we, ch := waiter.NewChannelEntry(nil) - wq.EventRegister(&we, waiter.EventIn) + wq.EventRegister(&we, waiter.ReadableEvents) ep, err := s.NewEndpoint(udp.ProtocolNumber, ipv4.ProtocolNumber, &wq) if err != nil { t.Fatalf("(eps[%d]) NewEndpoint(%d, %d, _): %s", len(eps), udp.ProtocolNumber, ipv4.ProtocolNumber, err) diff --git a/pkg/tcpip/tests/integration/route_test.go b/pkg/tcpip/tests/integration/route_test.go index ed499179f..78244f4eb 100644 --- a/pkg/tcpip/tests/integration/route_test.go +++ b/pkg/tcpip/tests/integration/route_test.go @@ -189,7 +189,7 @@ func TestLocalPing(t *testing.T) { var wq waiter.Queue we, ch := waiter.NewChannelEntry(nil) - wq.EventRegister(&we, waiter.EventIn) + wq.EventRegister(&we, waiter.ReadableEvents) ep, err := s.NewEndpoint(test.transProto, test.netProto, &wq) if err != nil { t.Fatalf("s.NewEndpoint(%d, %d, _): %s", test.transProto, test.netProto, err) @@ -311,7 +311,7 @@ func TestLocalUDP(t *testing.T) { var serverWQ waiter.Queue serverWE, serverCH := waiter.NewChannelEntry(nil) - serverWQ.EventRegister(&serverWE, waiter.EventIn) + serverWQ.EventRegister(&serverWE, waiter.ReadableEvents) server, err := s.NewEndpoint(udp.ProtocolNumber, test.firstPrimaryAddr.Protocol, &serverWQ) if err != nil { t.Fatalf("s.NewEndpoint(%d, %d): %s", udp.ProtocolNumber, test.firstPrimaryAddr.Protocol, err) @@ -325,7 +325,7 @@ func TestLocalUDP(t *testing.T) { var clientWQ waiter.Queue clientWE, clientCH := waiter.NewChannelEntry(nil) - clientWQ.EventRegister(&clientWE, waiter.EventIn) + clientWQ.EventRegister(&clientWE, waiter.ReadableEvents) client, err := s.NewEndpoint(udp.ProtocolNumber, test.firstPrimaryAddr.Protocol, &clientWQ) if err != nil { t.Fatalf("s.NewEndpoint(%d, %d): %s", udp.ProtocolNumber, test.firstPrimaryAddr.Protocol, err) |