Skip to content

Commit b7bb176

Browse files
committed
fix more tests
1 parent 5545bf5 commit b7bb176

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-
return coderAPI.CreateInMemoryProvisionerDaemon(ctx, t.Name())
534+
return coderAPI.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
if err != 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)