Commit5313884

authored and

committed

chore: fixTestTailnet/ForcesWebSockets flake (#8953)

1 parenta832029 commit5313884Copy full SHA for 5313884

File tree

-3

lines changed

-3

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ import (`
`13`	`13`
`14`	`14`	`"cdr.dev/slog"`
`15`	`15`	`"cdr.dev/slog/sloggers/sloghuman"`
`16`		`-`
`17`	`16`	`"github.com/coder/coder/coderd/database"`
`18`	`17`	`"github.com/coder/coder/coderd/database/dbauthz"`
`19`	`18`	`"github.com/coder/coder/codersdk/agentsdk"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func TestTailnet(t *testing.T) {`
`99`	`99`
`100`	`100`	`t.Run("ForcesWebSockets",func(t*testing.T) {`
`101`	`101`	`t.Parallel()`
`102`		`-ctx:=testutil.Context(t,testutil.WaitLong)`
	`102`	`+ctx:=testutil.Context(t,testutil.WaitMedium)`
`103`	`103`
`104`	`104`	`w1IP:=tailnet.IP()`
`105`	`105`	`derpMap:=tailnettest.RunDERPOnlyWebSockets(t)`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,8 @@ func RunDERPOnlyWebSockets(t testing.T) tailcfg.DERPMap {`
`77`	`77`	`handler,closeFunc=tailnet.WithWebsocketSupport(d,handler)`
`78`	`78`	`server:=httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter,r*http.Request) {`
`79`	`79`	`ifr.URL.Path!="/derp" {`
`80`		`-handler.ServeHTTP(w,r)`
	`80`	`+w.WriteHeader(http.StatusOK)`
	`81`	`+_,_=w.Write([]byte("hello"))`
`81`	`82`	`return`
`82`	`83`	`}`
`83`	`84`	`ifr.Header.Get("Upgrade")!="websocket" {`

Comments

(0)