diff options
| author | Tamir Duberstein <tamird@google.com> | 2021-05-24 13:02:40 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-05-24 13:05:02 -0700 |
| commit | df7c82a60c67e9188de752584b981708dd7b94d1 (patch) | |
| tree | 10e3b509379372b7ef0f90d3490450cae8ba5908 /pkg/tcpip/tests/integration | |
| parent | b60e23a7d9a4981e5ef11228e1e24a697e96a7ad (diff) | |
Move RunImmediatelyScheduledJobs to faketime
Use it everywhere.
PiperOrigin-RevId: 375539262
Diffstat (limited to 'pkg/tcpip/tests/integration')
| -rw-r--r-- | pkg/tcpip/tests/integration/BUILD | 1 | ||||
| -rw-r--r-- | pkg/tcpip/tests/integration/link_resolution_test.go | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/pkg/tcpip/tests/integration/BUILD b/pkg/tcpip/tests/integration/BUILD index e446c8cf3..8802f36b2 100644 --- a/pkg/tcpip/tests/integration/BUILD +++ b/pkg/tcpip/tests/integration/BUILD @@ -57,7 +57,6 @@ go_test( "//pkg/tcpip/link/channel", "//pkg/tcpip/link/pipe", "//pkg/tcpip/network/arp", - "//pkg/tcpip/network/internal/testutil", "//pkg/tcpip/network/ipv4", "//pkg/tcpip/network/ipv6", "//pkg/tcpip/stack", diff --git a/pkg/tcpip/tests/integration/link_resolution_test.go b/pkg/tcpip/tests/integration/link_resolution_test.go index 10bc8f65e..9f727eb8f 100644 --- a/pkg/tcpip/tests/integration/link_resolution_test.go +++ b/pkg/tcpip/tests/integration/link_resolution_test.go @@ -32,7 +32,6 @@ import ( "gvisor.dev/gvisor/pkg/tcpip/link/channel" "gvisor.dev/gvisor/pkg/tcpip/link/pipe" "gvisor.dev/gvisor/pkg/tcpip/network/arp" - iptestutil "gvisor.dev/gvisor/pkg/tcpip/network/internal/testutil" "gvisor.dev/gvisor/pkg/tcpip/network/ipv4" "gvisor.dev/gvisor/pkg/tcpip/network/ipv6" "gvisor.dev/gvisor/pkg/tcpip/stack" @@ -599,7 +598,7 @@ func TestForwardingWithLinkResolutionFailure(t *testing.T) { t.Fatalf("s.NUDConfigurations(%d, %d): %s", outgoingNICID, test.networkProtocolNumber, err) } // Trigger the first packet on the endpoint. - iptestutil.RunImmediatelyScheduledJobs(clock) + clock.RunImmediatelyScheduledJobs() for i := 0; i < int(nudConfigs.MaxMulticastProbes); i++ { if request, ok = outgoingEndpoint.Read(); !ok { |