NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commit9cf4e7f

authored

fix: prevent agent_test.go from failing on error logs (#11909)

We're failing tests on error logs like this:https://github.com/coder/coder/actions/runs/7706053882/job/21000984583Unfortunately, the error we hit, when the underlying connection is closed, is unexported, so we can't specifically ignore it.Part of the issue is that agent.Close() doesn't wait for these goroutines to complete before returning, so the test harness proceeds to close the connection. This looks to our product code like the network connection failing. It would be possible to fix this, but just doesn't seem worth it for the extra insurance of catching other error logs in these tests.

1 parentd3983e4 commit9cf4e7fCopy full SHA for 9cf4e7f

File tree

1 file changed

-3

lines changed

agent
- agent_test.go

1 file changed

-3

lines changed

`‎agent/agent_test.go`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ import (`
`35`	`35`	`"github.com/spf13/afero"`
`36`	`36`	`"github.com/stretchr/testify/assert"`
`37`	`37`	`"github.com/stretchr/testify/require"`
`38`		`-"github.com/valyala/fasthttp/fasthttputil"`
`39`	`38`	`"go.uber.org/goleak"`
`40`	`39`	`"go.uber.org/mock/gomock"`
`41`	`40`	`"golang.org/x/crypto/ssh"`
`@@ -2028,8 +2027,9 @@ func setupAgent(t *testing.T, metadata agentsdk.Manifest, ptyTimeout time.Durati`
`2028`	`2027`	`agent.Agent,`
`2029`	`2028`	`) {`
`2030`	`2029`	`logger:=slogtest.Make(t,&slogtest.Options{`
`2031`		`-// we get this error when closing the Agent API`
`2032`		`-IgnoredErrorIs:append(slogtest.DefaultIgnoredErrorIs,fasthttputil.ErrInmemoryListenerClosed),`
	`2030`	`+// Agent can drop errors when shutting down, and some, like the`
	`2031`	`+// fasthttplistener connection closed error, are unexported.`
	`2032`	`+IgnoreErrors:true,`
`2033`	`2033`	`}).Leveled(slog.LevelDebug)`
`2034`	`2034`	`ifmetadata.DERPMap==nil {`
`2035`	`2035`	`metadata.DERPMap,_=tailnettest.RunDERPAndSTUN(t)`

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!

Commit9cf4e7f

File tree

1 file changed

1 file changed

`‎agent/agent_test.go`

0 commit comments