Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb7bb176

Browse files
committed
fix more tests
1 parent5545bf5 commitb7bb176

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

‎coderd/coderdtest/coderdtest.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
531531
}()
532532

533533
daemon:=provisionerd.New(func(ctx context.Context) (provisionerdproto.DRPCProvisionerDaemonClient,error) {
534-
returncoderAPI.CreateInMemoryProvisionerDaemon(ctx,t.Name())
534+
returncoderAPI.CreateInMemoryProvisionerDaemon(ctx,"test")
535535
},&provisionerd.Options{
536536
Logger:coderAPI.Logger.Named("provisionerd").Leveled(slog.LevelDebug),
537537
UpdateInterval:250*time.Millisecond,

‎enterprise/coderd/provisionerdaemons.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,13 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
244244
APIVersion:"1.0",
245245
})
246246
iferr!=nil {
247-
log.Error(ctx,"create provisioner daemon",slog.Error(err))
248-
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
249-
Message:"Internal error creating provisioner daemon.",
250-
Detail:err.Error(),
251-
})
247+
if!xerrors.Is(err,context.Canceled) {
248+
log.Error(ctx,"create provisioner daemon",slog.Error(err))
249+
httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{
250+
Message:"Internal error creating provisioner daemon.",
251+
Detail:err.Error(),
252+
})
253+
}
252254
return
253255
}
254256

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp