util/retry: remove maxExpectedTimeSpent from tests

With the two-stage select implementation prioritizing context/closer
cancellation, timing is now deterministic. Remove non-deterministic
timing assertions and unused skip package dependency.

Release note: None

Author: sanki92

pkg/util/retry/BUILD.bazel

@@ -25,7 +25,6 @@ go_test(
     ],
     embed = [":retry"],
     deps = [
-        "//pkg/testutils/skip",
         "//pkg/util/log",
         "//pkg/util/timeutil",
         "@com_github_cockroachdb_errors//:errors",

pkg/util/retry/retry_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
 	"github.com/stretchr/testify/require"
@@ -402,10 +401,7 @@ func TestRetryWithMaxDuration(t *testing.T) {
 		retryFunc         func(attemptNum int) error
 		preRetryFunc      func()
 		expectedTimeSpent time.Duration
-		// For cases where the amount of time spent is not deterministic, we can set
-		// an upper bound instead (e.g. for context or closer).
-		maxExpectedTimeSpent time.Duration
-		expectedErr          bool
+		expectedErr       bool
 	}
 
 	testCases := []testcase{
@@ -473,8 +469,8 @@ func TestRetryWithMaxDuration(t *testing.T) {
 			preRetryFunc: func() {
 				cancelCtxFunc()
 			},
-			maxExpectedTimeSpent: time.Millisecond * 20,
-			expectedErr:          true,
+			expectedTimeSpent: time.Millisecond,
+			expectedErr:       true,
 		},
 		{
 			name: "errors with opt.Closer that is closed",
@@ -490,8 +486,8 @@ func TestRetryWithMaxDuration(t *testing.T) {
 			preRetryFunc: func() {
 				close(closeCh)
 			},
-			maxExpectedTimeSpent: time.Millisecond * 20,
-			expectedErr:          true,
+			expectedTimeSpent: time.Millisecond,
+			expectedErr:       true,
 		},
 	}
 
@@ -538,13 +534,6 @@ func TestRetryWithMaxDuration(t *testing.T) {
 					t, tc.expectedTimeSpent, timeSource.Since(start), "expected time does not match actual spent time",
 				)
 			}
-
-			if tc.maxExpectedTimeSpent != 0 {
-				require.LessOrEqual(
-					t, timeSource.Since(start), tc.maxExpectedTimeSpent,
-					"expected time spent to be less than or equal to max expected time spent",
-				)
-			}
 		})
 	}
 }