Commit75222b3

committed

add flush to wsproxy tests

1 parent7582d61 commit75222b3Copy full SHA for 75222b3

File tree

+15

-0

lines changed

enterprise
- coderd/coderdenttest
  - proxytest.go
- wsproxy
  - wsproxy_test.go

+15

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ type ProxyOptions struct {`
`37`	`37`
`38`	`38`	`// ProxyURL is optional`
`39`	`39`	`ProxyURL*url.URL`
	`40`	`+`
	`41`	`+// Flush is optional`
	`42`	`+Flushchanchan<-struct{}`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`// NewWorkspaceProxy will configure a wsproxy.Server with the given options.`
`@@ -113,6 +116,9 @@ func NewWorkspaceProxy(t testing.T, coderdAPI coderd.API, owner *codersdk.Clie`
`113`	`116`	`// Inherit collector options from coderd, but keep the wsproxy reporter.`
`114`	`117`	`statsCollectorOptions:=coderdAPI.Options.WorkspaceAppsStatsCollectorOptions`
`115`	`118`	`statsCollectorOptions.Reporter=nil`
	`119`	`+ifoptions.Flush!=nil {`
	`120`	`+statsCollectorOptions.Flush=options.Flush`
	`121`	`+}`
`116`	`122`
`117`	`123`	`wssrv,err:=wsproxy.New(ctx,&wsproxy.Options{`
`118`	`124`	`Logger:slogtest.Make(t,nil).Leveled(slog.LevelDebug),`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -442,6 +442,13 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {`
`442`	`442`	`"*",`
`443`	`443`	`}`
`444`	`444`
	`445`	`+proxyFlushCh:=make(chanchan<-struct{},1)`
	`446`	`+flushStats:=func() {`
	`447`	`+proxyFlushDone:=make(chanstruct{},1)`
	`448`	`+proxyFlushCh<-proxyFlushDone`
	`449`	`+<-proxyFlushDone`
	`450`	`+}`
	`451`	`+`
`445`	`452`	`client,closer,api,user:=coderdenttest.NewWithAPI(t,&coderdenttest.Options{`
`446`	`453`	`Options:&coderdtest.Options{`
`447`	`454`	`DeploymentValues:deploymentValues,`
`@@ -476,13 +483,15 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {`
`476`	`483`	`Name:"best-proxy",`
`477`	`484`	`AppHostname:opts.AppHost,`
`478`	`485`	`DisablePathApps:opts.DisablePathApps,`
	`486`	`+Flush:proxyFlushCh,`
`479`	`487`	`})`
`480`	`488`
`481`	`489`	`return&apptest.Deployment{`
`482`	`490`	`Options:opts,`
`483`	`491`	`SDKClient:client,`
`484`	`492`	`FirstUser:user,`
`485`	`493`	`PathAppBaseURL:proxyAPI.Options.AccessURL,`
	`494`	`+FlushStats:flushStats,`
`486`	`495`	`}`
`487`	`496`	`})`
`488`	`497`	`}`

Comments

(0)