fix(cli/portforward_test.go): use testutil.RequireRecv/SendCtx

johnstcn · johnstcn · commit 0caaf3a92c77 · 2024-03-20T13:01:05.000Z
diff --git a/cli/portforward_test.go b/cli/portforward_test.go
@@ -160,8 +160,9 @@ func TestPortForward(t *testing.T) {
 			err = <-errC
 			require.ErrorIs(t, err, context.Canceled)
 
-			wuTick <- dbtime.Now()
-			<-wuFlush
+			flushCtx := testutil.Context(t, testutil.WaitShort)
+			testutil.RequireSendCtx(flushCtx, t, wuTick, dbtime.Now())
+			_ = testutil.RequireRecvCtx(flushCtx, t, wuFlush)
 			updated, err := client.Workspace(context.Background(), workspace.ID)
 			require.NoError(t, err)
 			require.Greater(t, updated.LastUsedAt, workspace.LastUsedAt)
@@ -214,8 +215,9 @@ func TestPortForward(t *testing.T) {
 			err = <-errC
 			require.ErrorIs(t, err, context.Canceled)
 
-			wuTick <- dbtime.Now()
-			<-wuFlush
+			flushCtx := testutil.Context(t, testutil.WaitShort)
+			testutil.RequireSendCtx(flushCtx, t, wuTick, dbtime.Now())
+			_ = testutil.RequireRecvCtx(flushCtx, t, wuFlush)
 			updated, err := client.Workspace(context.Background(), workspace.ID)
 			require.NoError(t, err)
 			require.Greater(t, updated.LastUsedAt, workspace.LastUsedAt)
@@ -281,8 +283,9 @@ func TestPortForward(t *testing.T) {
 		err := <-errC
 		require.ErrorIs(t, err, context.Canceled)
 
-		wuTick <- dbtime.Now()
-		<-wuFlush
+		flushCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.RequireSendCtx(flushCtx, t, wuTick, dbtime.Now())
+		_ = testutil.RequireRecvCtx(flushCtx, t, wuFlush)
 		updated, err := client.Workspace(context.Background(), workspace.ID)
 		require.NoError(t, err)
 		require.Greater(t, updated.LastUsedAt, workspace.LastUsedAt)
