mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
chore: add standard test logger ignoring db canceled (#15556)
Refactors our use of `slogtest` to instantiate a "standard logger" across most of our tests. This standard logger incorporates https://github.com/coder/slog/pull/217 to also ignore database query canceled errors by default, which are a source of low-severity flakes. Any test that has set non-default `slogtest.Options` is left alone. In particular, `coderdtest` defaults to ignoring all errors. We might consider revisiting that decision now that we have better tools to target the really common flaky Error logs on shutdown.
This commit is contained in:
@@ -19,9 +19,9 @@ import (
|
||||
tslogger "tailscale.com/types/logger"
|
||||
"tailscale.com/types/nettype"
|
||||
|
||||
"cdr.dev/slog/sloggers/slogtest"
|
||||
"github.com/coder/coder/v2/tailnet"
|
||||
"github.com/coder/coder/v2/tailnet/proto"
|
||||
"github.com/coder/coder/v2/testutil"
|
||||
)
|
||||
|
||||
//go:generate mockgen -destination ./coordinatormock.go -package tailnettest github.com/coder/coder/v2/tailnet Coordinator
|
||||
@@ -50,7 +50,7 @@ func RunDERPAndSTUN(t *testing.T, opts ...DERPAndStunOption) (*tailcfg.DERPMap,
|
||||
for _, o := range opts {
|
||||
o(cfg)
|
||||
}
|
||||
logf := tailnet.Logger(slogtest.Make(t, nil))
|
||||
logf := tailnet.Logger(testutil.Logger(t))
|
||||
d := derp.NewServer(key.NewNode(), logf)
|
||||
server := httptest.NewUnstartedServer(derphttp.Handler(d))
|
||||
server.Config.ErrorLog = tslogger.StdLogger(logf)
|
||||
@@ -102,7 +102,7 @@ func RunDERPAndSTUN(t *testing.T, opts ...DERPAndStunOption) (*tailcfg.DERPMap,
|
||||
// only allows WebSockets through it. Many proxies do not support
|
||||
// upgrading DERP, so this is a good fallback.
|
||||
func RunDERPOnlyWebSockets(t *testing.T) *tailcfg.DERPMap {
|
||||
logf := tailnet.Logger(slogtest.Make(t, nil))
|
||||
logf := tailnet.Logger(testutil.Logger(t))
|
||||
d := derp.NewServer(key.NewNode(), logf)
|
||||
handler := derphttp.Handler(d)
|
||||
var closeFunc func()
|
||||
|
||||
Reference in New Issue
Block a user