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/network/internal/testutil | |
| parent | b60e23a7d9a4981e5ef11228e1e24a697e96a7ad (diff) | |
Move RunImmediatelyScheduledJobs to faketime
Use it everywhere.
PiperOrigin-RevId: 375539262
Diffstat (limited to 'pkg/tcpip/network/internal/testutil')
| -rw-r--r-- | pkg/tcpip/network/internal/testutil/BUILD | 1 | ||||
| -rw-r--r-- | pkg/tcpip/network/internal/testutil/testutil.go | 14 |
2 files changed, 0 insertions, 15 deletions
diff --git a/pkg/tcpip/network/internal/testutil/BUILD b/pkg/tcpip/network/internal/testutil/BUILD index b36134ddd..a180e5c75 100644 --- a/pkg/tcpip/network/internal/testutil/BUILD +++ b/pkg/tcpip/network/internal/testutil/BUILD @@ -15,7 +15,6 @@ go_library( deps = [ "//pkg/tcpip", "//pkg/tcpip/buffer", - "//pkg/tcpip/faketime", "//pkg/tcpip/header", "//pkg/tcpip/stack", ], diff --git a/pkg/tcpip/network/internal/testutil/testutil.go b/pkg/tcpip/network/internal/testutil/testutil.go index 328d5efee..605e9ef8d 100644 --- a/pkg/tcpip/network/internal/testutil/testutil.go +++ b/pkg/tcpip/network/internal/testutil/testutil.go @@ -19,27 +19,13 @@ package testutil import ( "fmt" "math/rand" - "time" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/buffer" - "gvisor.dev/gvisor/pkg/tcpip/faketime" "gvisor.dev/gvisor/pkg/tcpip/header" "gvisor.dev/gvisor/pkg/tcpip/stack" ) -const ( - // immediateDuration is a duration of zero for scheduling work that needs to - // be done immediately but asynchronously to avoid deadlock. - immediateDuration time.Duration = 0 -) - -// RunImmediatelyScheduledJobs runs all jobs scheduled to run at the current -// time. -func RunImmediatelyScheduledJobs(clock *faketime.ManualClock) { - clock.Advance(immediateDuration) -} - // MockLinkEndpoint is an endpoint used for testing, it stores packets written // to it and can mock errors. type MockLinkEndpoint struct { |