Commit206b8fb

committed

address PR comments

1 parentbbbc2d5 commit206b8fbCopy full SHA for 206b8fb

File tree

+10

-16

lines changed

coderd
- database/dbmem
  - dbmem.go
- workspaceapps/apptest
  - apptest.go
enterprise
- coderd/coderdenttest
  - proxytest.go
- wsproxy
  - wsproxy_test.go

+10

-16

lines changed

Lines changed: 0 additions & 3 deletions

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`		`-ifn==0 {`
`989`		`-returnsql.ErrNoRows`
`990`		`-}`
`991`	`988`	`returnnil`
`992`	`989`	`}`
`993`	`990`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1570,10 +1570,9 @@ func testReconnectingPTY(ctx context.Context, t testing.T, client codersdk.Cli`
`1570`	`1570`	`funcassertWorkspaceLastUsedAtUpdated(t testing.TB,details*Details) {`
`1571`	`1571`	`t.Helper()`
`1572`	`1572`
`1573`		`-<-time.After(testutil.IntervalMedium)// Wait for Bicopy to finish.`
`1574`		`-details.FlushStats()`
`1575`	`1573`	`// Wait for stats to fully flush.`
`1576`	`1574`	`require.Eventually(t,func()bool {`
	`1575`	`+details.FlushStats()`
`1577`	`1576`	`ws,err:=details.SDKClient.Workspace(context.Background(),details.Workspace.ID)`
`1578`	`1577`	`assert.NoError(t,err)`
`1579`	`1578`	`returnws.LastUsedAt.After(details.Workspace.LastUsedAt)`
`@@ -1585,9 +1584,7 @@ func assertWorkspaceLastUsedAtUpdated(t testing.TB, details *Details) {`
`1585`	`1584`	`funcassertWorkspaceLastUsedAtNotUpdated(t testing.TB,details*Details) {`
`1586`	`1585`	`t.Helper()`
`1587`	`1586`
`1588`		`-<-time.After(testutil.IntervalMedium)// Wait for Bicopy to finish.`
`1589`	`1587`	`details.FlushStats()`
`1590`		`-<-time.After(testutil.IntervalMedium)// Wait for stats to fully flush.`
`1591`	`1588`	`ws,err:=details.SDKClient.Workspace(context.Background(),details.Workspace.ID)`
`1592`	`1589`	`require.NoError(t,err)`
`1593`	`1590`	`require.Equal(t,ws.LastUsedAt,details.Workspace.LastUsedAt,"workspace LastUsedAt updated when it should not have been")`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ type ProxyOptions struct {`
`38`	`38`	`// ProxyURL is optional`
`39`	`39`	`ProxyURL*url.URL`
`40`	`40`
`41`		`-//Flush is optional`
`42`		`-Flushchanchan<-struct{}`
	`41`	`+//FlushStats is optional`
	`42`	`+FlushStatschanchan<-struct{}`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// 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`
`116`	`116`	`// Inherit collector options from coderd, but keep the wsproxy reporter.`
`117`	`117`	`statsCollectorOptions:=coderdAPI.Options.WorkspaceAppsStatsCollectorOptions`
`118`	`118`	`statsCollectorOptions.Reporter=nil`
`119`		`-ifoptions.Flush!=nil {`
`120`		`-statsCollectorOptions.Flush=options.Flush`
	`119`	`+ifoptions.FlushStats!=nil {`
	`120`	`+statsCollectorOptions.Flush=options.FlushStats`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`wssrv,err:=wsproxy.New(ctx,&wsproxy.Options{`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -442,11 +442,11 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {`
`442`	`442`	`"*",`
`443`	`443`	`}`
`444`	`444`
`445`		`-proxyFlushCh:=make(chanchan<-struct{})`
	`445`	`+proxyStatsCollectorFlushCh:=make(chanchan<-struct{},1)`
`446`	`446`	`flushStats:=func() {`
`447`		`-proxyFlushDone:=make(chanstruct{})`
`448`		`-proxyFlushCh<-proxyFlushDone`
`449`		`-<-proxyFlushDone`
	`447`	`+proxyStatsCollectorFlushDone:=make(chanstruct{},1)`
	`448`	`+proxyStatsCollectorFlushCh<-proxyStatsCollectorFlushDone`
	`449`	`+<-proxyStatsCollectorFlushDone`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`client,closer,api,user:=coderdenttest.NewWithAPI(t,&coderdenttest.Options{`
`@@ -483,7 +483,7 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {`
`483`	`483`	`Name:"best-proxy",`
`484`	`484`	`AppHostname:opts.AppHost,`
`485`	`485`	`DisablePathApps:opts.DisablePathApps,`
`486`		`-Flush:proxyFlushCh,`
	`486`	`+FlushStats:proxyStatsCollectorFlushCh,`
`487`	`487`	`})`
`488`	`488`
`489`	`489`	`return&apptest.Deployment{`

Comments

(0)