Remove SuperShort duration as extraneous

dannykopping · dannykopping · commit acd104c807e8 · 2024-03-28T07:13:11.000+02:00
Signed-off-by: Danny Kopping &lt;danny@coder.com&gt;
diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go
@@ -150,7 +150,7 @@ func TestWorkspaceStatuses(t *testing.T) {
 		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 			registry := prometheus.NewRegistry()
-			closeFunc, err := prometheusmetrics.Workspaces(context.Background(), slogtest.Make(t, nil), registry, tc.Database(), testutil.IntervalFast)
+			closeFunc, err := prometheusmetrics.Workspaces(context.Background(), slogtest.Make(t, nil).Leveled(slog.LevelWarn), registry, tc.Database(), testutil.IntervalFast)
 			require.NoError(t, err)
 			t.Cleanup(closeFunc)
 
@@ -179,7 +179,7 @@ func TestWorkspaceStatuses(t *testing.T) {
 				}
 				t.Logf("sum %d == total %d", sum, tc.Total)
 				return sum == tc.Total
-			}, testutil.WaitSuperShort, testutil.IntervalFast)
+			}, testutil.WaitShort, testutil.IntervalFast)
 		})
 	}
 }
@@ -270,7 +270,7 @@ func TestWorkspaceDetails(t *testing.T) {
 				t.Logf("status series = %d, expected == %d", stSum, tc.ExpectedSeries)
 				t.Logf("workspace series = %d, expected == %d", len(wMap), tc.ExpectedWorkspaces)
 				return stSum == tc.ExpectedSeries && len(wMap) == tc.ExpectedWorkspaces
-			}, testutil.WaitSuperShort, testutil.IntervalFast)
+			}, testutil.WaitShort, testutil.IntervalFast)
 		})
 	}
 }
diff --git a/testutil/duration.go b/testutil/duration.go
@@ -9,11 +9,10 @@ import (
 // Constants for timing out operations, usable for creating contexts
 // that timeout or in require.Eventually.
 const (
-	WaitSuperShort = time.Second
-	WaitShort      = 10 * time.Second
-	WaitMedium     = 15 * time.Second
-	WaitLong       = 25 * time.Second
-	WaitSuperLong  = 60 * time.Second
+	WaitShort     = 10 * time.Second
+	WaitMedium    = 15 * time.Second
+	WaitLong      = 25 * time.Second
+	WaitSuperLong = 60 * time.Second
 )
 
 // Constants for delaying repeated operations, e.g. in
diff --git a/testutil/duration_windows.go b/testutil/duration_windows.go
@@ -7,11 +7,10 @@ import "time"
 //
 // Windows durations are adjusted for slow CI workers.
 const (
-	WaitSuperShort = time.Second
-	WaitShort      = 15 * time.Second
-	WaitMedium     = 20 * time.Second
-	WaitLong       = 35 * time.Second
-	WaitSuperLong  = 120 * time.Second
+	WaitShort     = 15 * time.Second
+	WaitMedium    = 20 * time.Second
+	WaitLong      = 35 * time.Second
+	WaitSuperLong = 120 * time.Second
 )
 
 // Constants for delaying repeated operations, e.g. in

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func TestWorkspaceStatuses(t *testing.T) {`
`150`	`150`	`t.Run(tc.Name, func(t *testing.T) {`
`151`	`151`	`t.Parallel()`
`152`	`152`	`registry := prometheus.NewRegistry()`
`153`		`- closeFunc, err := prometheusmetrics.Workspaces(context.Background(), slogtest.Make(t, nil), registry, tc.Database(), testutil.IntervalFast)`
	`153`	`+ closeFunc, err := prometheusmetrics.Workspaces(context.Background(), slogtest.Make(t, nil).Leveled(slog.LevelWarn), registry, tc.Database(), testutil.IntervalFast)`
`154`	`154`	`require.NoError(t, err)`
`155`	`155`	`t.Cleanup(closeFunc)`
`156`	`156`
`@@ -179,7 +179,7 @@ func TestWorkspaceStatuses(t *testing.T) {`
`179`	`179`	`}`
`180`	`180`	`t.Logf("sum %d == total %d", sum, tc.Total)`
`181`	`181`	`return sum == tc.Total`
`182`		`- }, testutil.WaitSuperShort, testutil.IntervalFast)`
	`182`	`+ }, testutil.WaitShort, testutil.IntervalFast)`
`183`	`183`	`})`
`184`	`184`	`}`
`185`	`185`	`}`
`@@ -270,7 +270,7 @@ func TestWorkspaceDetails(t *testing.T) {`
`270`	`270`	`t.Logf("status series = %d, expected == %d", stSum, tc.ExpectedSeries)`
`271`	`271`	`t.Logf("workspace series = %d, expected == %d", len(wMap), tc.ExpectedWorkspaces)`
`272`	`272`	`return stSum == tc.ExpectedSeries && len(wMap) == tc.ExpectedWorkspaces`
`273`		`- }, testutil.WaitSuperShort, testutil.IntervalFast)`
	`273`	`+ }, testutil.WaitShort, testutil.IntervalFast)`
`274`	`274`	`})`
`275`	`275`	`}`
`276`	`276`	`}`