address PR comments

johnstcn · johnstcn · commit 8573ba729efa · 2024-01-16T13:48:43.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -985,9 +985,6 @@ func (q *FakeQuerier) BatchUpdateWorkspaceLastUsedAt(_ context.Context, arg data
 		q.workspaces[i].LastUsedAt = arg.LastUsedAt
 		n++
 	}
-	if n == 0 {
-		return sql.ErrNoRows
-	}
 	return nil
 }
 
diff --git a/coderd/workspaceapps/apptest/apptest.go b/coderd/workspaceapps/apptest/apptest.go
@@ -1570,10 +1570,9 @@ func testReconnectingPTY(ctx context.Context, t *testing.T, client *codersdk.Cli
 func assertWorkspaceLastUsedAtUpdated(t testing.TB, details *Details) {
 	t.Helper()
 
-	<-time.After(testutil.IntervalMedium) // Wait for Bicopy to finish.
-	details.FlushStats()
 	// Wait for stats to fully flush.
 	require.Eventually(t, func() bool {
+		details.FlushStats()
 		ws, err := details.SDKClient.Workspace(context.Background(), details.Workspace.ID)
 		assert.NoError(t, err)
 		return ws.LastUsedAt.After(details.Workspace.LastUsedAt)
@@ -1585,9 +1584,7 @@ func assertWorkspaceLastUsedAtUpdated(t testing.TB, details *Details) {
 func assertWorkspaceLastUsedAtNotUpdated(t testing.TB, details *Details) {
 	t.Helper()
 
-	<-time.After(testutil.IntervalMedium) // Wait for Bicopy to finish.
 	details.FlushStats()
-	<-time.After(testutil.IntervalMedium) // Wait for stats to fully flush.
 	ws, err := details.SDKClient.Workspace(context.Background(), details.Workspace.ID)
 	require.NoError(t, err)
 	require.Equal(t, ws.LastUsedAt, details.Workspace.LastUsedAt, "workspace LastUsedAt updated when it should not have been")
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -262,12 +262,12 @@ func TestWorkspaceApps(t *testing.T) {
 			opts.AppHost = ""
 		}
 
-		statsFlushCh := make(chan chan<- struct{})
-		opts.StatsCollectorOptions.Flush = statsFlushCh
+		flushStatsCollectorCh := make(chan chan<- struct{}, 1)
+		opts.StatsCollectorOptions.Flush = flushStatsCollectorCh
 		flushStats := func() {
-			flushDone := make(chan struct{})
-			statsFlushCh <- flushDone
-			<-flushDone
+			flushStatsCollectorDone := make(chan struct{}, 1)
+			flushStatsCollectorCh <- flushStatsCollectorDone
+			<-flushStatsCollectorDone
 		}
 		client := coderdtest.New(t, &coderdtest.Options{
 			DeploymentValues:         deploymentValues,
diff --git a/enterprise/coderd/coderdenttest/proxytest.go b/enterprise/coderd/coderdenttest/proxytest.go
@@ -38,8 +38,8 @@ type ProxyOptions struct {
 	// ProxyURL is optional
 	ProxyURL *url.URL
 
-	// Flush is optional
-	Flush chan chan<- struct{}
+	// FlushStats is optional
+	FlushStats chan chan<- struct{}
 }
 
 // NewWorkspaceProxy will configure a wsproxy.Server with the given options.
@@ -116,8 +116,8 @@ func NewWorkspaceProxy(t *testing.T, coderdAPI *coderd.API, owner *codersdk.Clie
 	// Inherit collector options from coderd, but keep the wsproxy reporter.
 	statsCollectorOptions := coderdAPI.Options.WorkspaceAppsStatsCollectorOptions
 	statsCollectorOptions.Reporter = nil
-	if options.Flush != nil {
-		statsCollectorOptions.Flush = options.Flush
+	if options.FlushStats != nil {
+		statsCollectorOptions.Flush = options.FlushStats
 	}
 
 	wssrv, err := wsproxy.New(ctx, &wsproxy.Options{
diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go
@@ -442,11 +442,11 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {
 			"*",
 		}
 
-		proxyFlushCh := make(chan chan<- struct{})
+		proxyStatsCollectorFlushCh := make(chan chan<- struct{}, 1)
 		flushStats := func() {
-			proxyFlushDone := make(chan struct{})
-			proxyFlushCh <- proxyFlushDone
-			<-proxyFlushDone
+			proxyStatsCollectorFlushDone := make(chan struct{}, 1)
+			proxyStatsCollectorFlushCh <- proxyStatsCollectorFlushDone
+			<-proxyStatsCollectorFlushDone
 		}
 
 		client, closer, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
@@ -483,7 +483,7 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {
 			Name:            "best-proxy",
 			AppHostname:     opts.AppHost,
 			DisablePathApps: opts.DisablePathApps,
-			Flush:           proxyFlushCh,
+			FlushStats:      proxyStatsCollectorFlushCh,
 		})
 
 		return &apptest.Deployment{

Original file line number	Diff line number	Diff line change
`@@ -985,9 +985,6 @@ func (q *FakeQuerier) BatchUpdateWorkspaceLastUsedAt(_ context.Context, arg data`
`985`	`985`	`q.workspaces[i].LastUsedAt = arg.LastUsedAt`
`986`	`986`	`n++`
`987`	`987`	`}`
`988`		`- if n == 0 {`
`989`		`- return sql.ErrNoRows`
`990`		`- }`
`991`	`988`	`return nil`
`992`	`989`	`}`
`993`	`990`