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

fix: ignore context canceled error on server (#4128)

This commit is contained in:
Colin Adler 2022-09-19 23:56:51 -05:00 committed by GitHub
parent 67230babc0
commit 8d7954b015
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/resetpassword_test.go
View File

@ -47,7 +47,7 @@ func TestResetPassword(t *testing.T) {
go func() {
defer close(serverDone)
err = serverCmd.ExecuteContext(ctx)
assert.ErrorIs(t, err, context.Canceled)
assert.NoError(t, err)
}()
var rawURL string
require.Eventually(t, func() bool {

3
cli/server.go
View File

@ -690,6 +690,9 @@ func Server(newAPI func(context.Context, *coderd.Options) (*coderd.API, error))
// Trigger context cancellation for any remaining services.
cancel()
if xerrors.Is(exitErr, context.Canceled) {
return nil
}
return exitErr
},
}

16
cli/server_test.go
View File

@ -73,7 +73,7 @@ func TestServer(t *testing.T) {
})
require.NoError(t, err)
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
})
t.Run("BuiltinPostgres", func(t *testing.T) {
t.Parallel()
@ -101,7 +101,7 @@ func TestServer(t *testing.T) {
return err == nil && rawURL != ""
}, 3*time.Minute, testutil.IntervalFast, "failed to get access URL")
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
})
t.Run("BuiltinPostgresURL", func(t *testing.T) {
t.Parallel()
@ -144,7 +144,7 @@ func TestServer(t *testing.T) {
pty.ExpectMatch("View the Web UI: http://localhost:3000/")
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
})
// Validate that an https scheme is prepended to a remote access URL
@ -176,7 +176,7 @@ func TestServer(t *testing.T) {
pty.ExpectMatch("View the Web UI: https://foobarbaz.mydomain")
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
})
t.Run("NoWarningWithRemoteAccessURL", func(t *testing.T) {
@ -205,7 +205,7 @@ func TestServer(t *testing.T) {
pty.ExpectMatch("View the Web UI: https://google.com")
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
})
t.Run("TLSBadVersion", func(t *testing.T) {
@ -291,7 +291,7 @@ func TestServer(t *testing.T) {
require.NoError(t, err)
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
})
// This cannot be ran in parallel because it uses a signal.
//nolint:paralleltest
@ -322,7 +322,7 @@ func TestServer(t *testing.T) {
// We cannot send more signals here, because it's possible Coder
// has already exited, which could cause the test to fail due to interrupt.
err = <-serverErr
require.ErrorIs(t, err, context.Canceled)
require.NoError(t, err)
})
t.Run("TracerNoLeak", func(t *testing.T) {
t.Parallel()
@ -341,7 +341,7 @@ func TestServer(t *testing.T) {
errC <- root.ExecuteContext(ctx)
}()
cancelFunc()
require.ErrorIs(t, <-errC, context.Canceled)
require.NoError(t, <-errC)
require.Error(t, goleak.Find())
})
t.Run("Telemetry", func(t *testing.T) {