selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: give additional time in tests for `tailnetAPIConnector` graceful disconnect (#12980) 

Failure seen here: https://github.com/coder/coder/actions/runs/8711258577/job/23894964182?pr=12979
This commit is contained in:
Colin Adler 2024-04-17 12:38:17 -05:00 committed by GitHub
parent 3338cdca77
commit 6b4eb03192
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codersdk/workspacesdk/connector.go
View File

@ -20,6 +20,8 @@ import (
"github.com/coder/retry"
)
var tailnetConnectorGracefulTimeout = time.Second
// tailnetConn is the subset of the tailnet.Conn methods that tailnetAPIConnector uses. It is
// included so that we can fake it in testing.
//
@ -86,7 +88,7 @@ func runTailnetAPIConnector(
func (tac *tailnetAPIConnector) manageGracefulTimeout() {
defer tac.cancelGracefulCtx()
<-tac.ctx.Done()
timer := time.NewTimer(time.Second)
timer := time.NewTimer(tailnetConnectorGracefulTimeout)
defer timer.Stop()
select {
case <-tac.closed:

5
codersdk/workspacesdk/connector_internal_test.go
View File

@ -24,6 +24,11 @@ import (
"github.com/coder/coder/v2/testutil"
)
func init() {
// Give tests a bit more time to timeout. Darwin is particularly slow.
tailnetConnectorGracefulTimeout = 5 * time.Second
}
func TestTailnetAPIConnector_Disconnects(t *testing.T) {
t.Parallel()
testCtx := testutil.Context(t, testutil.WaitShort)