fix ruleguard linter

johnstcn · johnstcn · commit 32b578ec71a7 · 2022-08-05T13:08:48.000Z
diff --git a/scripts/rules.go b/scripts/rules.go
@@ -91,7 +91,7 @@ func useStandardTimeoutsAndDelaysInTests(m dsl.Matcher) {
 	m.Import("github.com/coder/coder/testutil")
 
 	m.Match(`context.WithTimeout($ctx, $duration)`).
-		Where(m.File().Imports("testing") && !m["duration"].Text.Matches("^testutil\\.")).
+		Where(m.File().Imports("testing") && !m.File().PkgPath.Matches("testutil$") && !m["duration"].Text.Matches("^testutil\\.")).
 		At(m["duration"]).
 		Report("Do not use magic numbers in test timeouts and delays. Use the standard testutil.Wait* or testutil.Interval* constants instead.")
 
diff --git a/testutil/eventually.go b/testutil/eventually.go
@@ -39,7 +39,6 @@ func Eventually(ctx context.Context, t testing.TB, condition func() bool, tick t
 // EventuallyShort is a convenience function that runs Eventually with
 // IntervalFast and times out after WaitShort.
 func EventuallyShort(t testing.TB, condition func() bool) bool {
-	//nolint: gocritic
 	ctx, cancel := context.WithTimeout(context.Background(), WaitShort)
 	defer cancel()
 	return Eventually(ctx, t, condition, IntervalFast)
@@ -48,7 +47,6 @@ func EventuallyShort(t testing.TB, condition func() bool) bool {
 // EventuallyMedium is a convenience function that runs Eventually with
 // IntervalMedium and times out after WaitMedium.
 func EventuallyMedium(t testing.TB, condition func() bool) bool {
-	//nolint: gocritic
 	ctx, cancel := context.WithTimeout(context.Background(), WaitMedium)
 	defer cancel()
 	return Eventually(ctx, t, condition, IntervalMedium)
@@ -57,7 +55,6 @@ func EventuallyMedium(t testing.TB, condition func() bool) bool {
 // EventuallyLong is a convenience function that runs Eventually with
 // IntervalSlow and times out after WaitLong.
 func EventuallyLong(t testing.TB, condition func() bool) bool {
-	//nolint: gocritic
 	ctx, cancel := context.WithTimeout(context.Background(), WaitLong)
 	defer cancel()
 	return Eventually(ctx, t, condition, IntervalSlow)
