NotificationsYou must be signed in to change notification settings
Fork1k
Star11.1k

Commit6ba5521

authored

test: fix timeout on TestServer_X11_EvictionLRU (#19217)

fixescoder/internal#878On my dev system it takes 900ms, but looking at timestamps in CI it took25 seconds. Bumping timeout to 60s.Also fixes the segfault.

1 parent2851d9f commit6ba5521Copy full SHA for 6ba5521

File tree

1 file changed

-2

lines changed

agent/agentssh
- x11_test.go

1 file changed

-2

lines changed

`‎agent/agentssh/x11_test.go‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ func TestServer_X11_EvictionLRU(t *testing.T) {`
`135`	`135`	`t.Skip("X11 forwarding is only supported on Linux")`
`136`	`136`	`}`
`137`	`137`
`138`		`-ctx:=testutil.Context(t,testutil.WaitLong)`
	`138`	`+ctx:=testutil.Context(t,testutil.WaitSuperLong)`
`139`	`139`	`logger:=testutil.Logger(t)`
`140`	`140`	`fs:=afero.NewMemMapFs()`
`141`	`141`
`@@ -238,7 +238,9 @@ func TestServer_X11_EvictionLRU(t *testing.T) {`
`238`	`238`	`payload:="hello world"`
`239`	`239`	`gofunc() {`
`240`	`240`	`conn,err:=inproc.Dial(ctx,testutil.NewAddr("tcp",fmt.Sprintf("localhost:%d",agentssh.X11StartPort+agentssh.X11DefaultDisplayOffset)))`
`241`		`-assert.NoError(t,err)`
	`241`	`+if!assert.NoError(t,err) {`
	`242`	`+return`
	`243`	`+}`
`242`	`244`	`_,err=conn.Write([]byte(payload))`
`243`	`245`	`assert.NoError(t,err)`
`244`	`246`	`_=conn.Close()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6ba5521

File tree

1 file changed

1 file changed

`‎agent/agentssh/x11_test.go‎`

0 commit comments