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

chore: add standard test logger ignoring db canceled#15556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
spikecurtis merged 1 commit intomainfromspike/std-test-logger
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletionsagent/agent_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1508,7 +1508,7 @@ func TestAgent_Lifecycle(t *testing.T) {

t.Run("ShutdownScriptOnce", func(t *testing.T) {
t.Parallel()
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
expected := "this-is-shutdown"
derpMap, _ := tailnettest.RunDERPAndSTUN(t)

Expand DownExpand Up@@ -1863,7 +1863,7 @@ func TestAgent_Dial(t *testing.T) {
func TestAgent_UpdatedDERP(t *testing.T) {
t.Parallel()

logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)

originalDerpMap, _ := tailnettest.RunDERPAndSTUN(t)
require.NotNil(t, originalDerpMap)
Expand DownExpand Up@@ -2019,7 +2019,7 @@ func TestAgent_Speedtest(t *testing.T) {

func TestAgent_Reconnect(t *testing.T) {
t.Parallel()
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
// After the agent is disconnected from a coordinator, it's supposed
// to reconnect!
coordinator := tailnet.NewCoordinator(logger)
Expand DownExpand Up@@ -2060,7 +2060,7 @@ func TestAgent_Reconnect(t *testing.T) {

func TestAgent_WriteVSCodeConfigs(t *testing.T) {
t.Parallel()
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
coordinator := tailnet.NewCoordinator(logger)
defer coordinator.Close()

Expand Down
11 changes: 5 additions & 6 deletionsagent/agentscripts/agentscripts_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ import (
"github.com/stretchr/testify/require"
"go.uber.org/goleak"

"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent/agentscripts"
"github.com/coder/coder/v2/agent/agentssh"
"github.com/coder/coder/v2/agent/agenttest"
Expand All@@ -35,7 +34,7 @@ func TestExecuteBasic(t *testing.T) {
return fLogger
})
defer runner.Close()
aAPI := agenttest.NewFakeAgentAPI(t,slogtest.Make(t, nil), nil, nil)
aAPI := agenttest.NewFakeAgentAPI(t,testutil.Logger(t), nil, nil)
err := runner.Init([]codersdk.WorkspaceAgentScript{{
LogSourceID: uuid.New(),
Script: "echo hello",
Expand All@@ -61,7 +60,7 @@ func TestEnv(t *testing.T) {
cmd.exe /c echo %CODER_SCRIPT_BIN_DIR%
`
}
aAPI := agenttest.NewFakeAgentAPI(t,slogtest.Make(t, nil), nil, nil)
aAPI := agenttest.NewFakeAgentAPI(t,testutil.Logger(t), nil, nil)
err := runner.Init([]codersdk.WorkspaceAgentScript{{
LogSourceID: id,
Script: script,
Expand DownExpand Up@@ -102,7 +101,7 @@ func TestTimeout(t *testing.T) {
t.Parallel()
runner := setup(t, nil)
defer runner.Close()
aAPI := agenttest.NewFakeAgentAPI(t,slogtest.Make(t, nil), nil, nil)
aAPI := agenttest.NewFakeAgentAPI(t,testutil.Logger(t), nil, nil)
err := runner.Init([]codersdk.WorkspaceAgentScript{{
LogSourceID: uuid.New(),
Script: "sleep infinity",
Expand All@@ -121,7 +120,7 @@ func TestScriptReportsTiming(t *testing.T) {
return fLogger
})

aAPI := agenttest.NewFakeAgentAPI(t,slogtest.Make(t, nil), nil, nil)
aAPI := agenttest.NewFakeAgentAPI(t,testutil.Logger(t), nil, nil)
err := runner.Init([]codersdk.WorkspaceAgentScript{{
DisplayName: "say-hello",
LogSourceID: uuid.New(),
Expand DownExpand Up@@ -160,7 +159,7 @@ func setup(t *testing.T, getScriptLogger func(logSourceID uuid.UUID) agentscript
}
}
fs := afero.NewMemMapFs()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
s, err := agentssh.NewServer(context.Background(), logger, prometheus.NewRegistry(), fs, nil)
require.NoError(t, err)
t.Cleanup(func() {
Expand Down
4 changes: 1 addition & 3 deletionsagent/agentssh/agentssh_internal_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,6 @@ import (

"github.com/coder/coder/v2/pty"
"github.com/coder/coder/v2/testutil"

"cdr.dev/slog/sloggers/slogtest"
)

const longScript = `
Expand All@@ -36,7 +34,7 @@ func Test_sessionStart_orphan(t *testing.T) {

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
defer cancel()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
s, err := NewServer(ctx, logger, prometheus.NewRegistry(), afero.NewMemMapFs(), nil)
require.NoError(t, err)
defer s.Close()
Expand Down
8 changes: 4 additions & 4 deletionsagent/agentssh/agentssh_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ func TestNewServer_ServeClient(t *testing.T) {
t.Parallel()

ctx := context.Background()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
s, err := agentssh.NewServer(ctx, logger, prometheus.NewRegistry(), afero.NewMemMapFs(), nil)
require.NoError(t, err)
defer s.Close()
Expand DownExpand Up@@ -76,7 +76,7 @@ func TestNewServer_ExecuteShebang(t *testing.T) {
}

ctx := context.Background()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
s, err := agentssh.NewServer(ctx, logger, prometheus.NewRegistry(), afero.NewMemMapFs(), nil)
require.NoError(t, err)
t.Cleanup(func() {
Expand DownExpand Up@@ -158,7 +158,7 @@ func TestNewServer_Signal(t *testing.T) {
t.Parallel()

ctx := context.Background()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
s, err := agentssh.NewServer(ctx, logger, prometheus.NewRegistry(), afero.NewMemMapFs(), nil)
require.NoError(t, err)
defer s.Close()
Expand DownExpand Up@@ -223,7 +223,7 @@ func TestNewServer_Signal(t *testing.T) {
t.Parallel()

ctx := context.Background()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
s, err := agentssh.NewServer(ctx, logger, prometheus.NewRegistry(), afero.NewMemMapFs(), nil)
require.NoError(t, err)
defer s.Close()
Expand Down
4 changes: 1 addition & 3 deletionsagent/agentssh/x11_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,8 +21,6 @@ import (
"github.com/stretchr/testify/require"
gossh "golang.org/x/crypto/ssh"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent/agentssh"
"github.com/coder/coder/v2/testutil"
)
Expand All@@ -34,7 +32,7 @@ func TestServer_X11(t *testing.T) {
}

ctx := context.Background()
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
fs := afero.NewOsFs()
s, err := agentssh.NewServer(ctx, logger, prometheus.NewRegistry(), fs, &agentssh.Config{})
require.NoError(t, err)
Expand Down
5 changes: 2 additions & 3 deletionsagent/agenttest/agent.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ import (

"github.com/stretchr/testify/assert"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/testutil"
)

// New starts a new agent for use in tests.
Expand All@@ -24,7 +23,7 @@ func New(t testing.TB, coderURL *url.URL, agentToken string, opts ...func(*agent
t.Helper()

var o agent.Options
log :=slogtest.Make(t, nil).Leveled(slog.LevelDebug).Named("agent")
log :=testutil.Logger(t).Named("agent")
o.Logger = log

for _, opt := range opts {
Expand Down
6 changes: 2 additions & 4 deletionsagent/apphealth_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,8 +12,6 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/require"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/agent/proto"
Expand DownExpand Up@@ -258,10 +256,10 @@ func setupAppReporter(
// We use a proper fake agent API so we can test the conversion code and the
// request code as well. Before we were bypassing these by using a custom
// post function.
fakeAAPI := agenttest.NewFakeAgentAPI(t,slogtest.Make(t, nil), nil, nil)
fakeAAPI := agenttest.NewFakeAgentAPI(t,testutil.Logger(t), nil, nil)

go agent.NewAppHealthReporterWithClock(
slogtest.Make(t, nil).Leveled(slog.LevelDebug),
testutil.Logger(t),
apps, agentsdk.AppHealthPoster(fakeAAPI), clk,
)(ctx)

Expand Down
4 changes: 2 additions & 2 deletionsagent/checkpoint_internal_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ import (

func TestCheckpoint_CompleteWait(t *testing.T) {
t.Parallel()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
ctx := testutil.Context(t, testutil.WaitShort)
uut := newCheckpoint(logger)
err := xerrors.New("test")
Expand All@@ -35,7 +35,7 @@ func TestCheckpoint_CompleteTwice(t *testing.T) {

func TestCheckpoint_WaitComplete(t *testing.T) {
t.Parallel()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
ctx := testutil.Context(t, testutil.WaitShort)
uut := newCheckpoint(logger)
err := xerrors.New("test")
Expand Down
3 changes: 1 addition & 2 deletionsagent/stats_internal_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,15 +18,14 @@ import (

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogjson"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent/proto"
"github.com/coder/coder/v2/testutil"
)

func TestStatsReporter(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitShort)
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
fSource := newFakeNetworkStatsSource(ctx, t)
fCollector := newFakeCollector(t)
fDest := newFakeStatsDest()
Expand Down
6 changes: 2 additions & 4 deletionscli/server_internal_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,6 @@ import (

"cdr.dev/slog"
"cdr.dev/slog/sloggers/sloghuman"
"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/testutil"
"github.com/coder/serpent"
Expand All@@ -24,7 +22,7 @@ func Test_configureServerTLS(t *testing.T) {
t.Parallel()
t.Run("DefaultNoInsecureCiphers", func(t *testing.T) {
t.Parallel()
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
cfg, err := configureServerTLS(context.Background(), logger, "tls12", "none", nil, nil, "", nil, false)
require.NoError(t, err)

Expand DownExpand Up@@ -251,7 +249,7 @@ func TestRedirectHTTPToHTTPSDeprecation(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitShort)
logger :=slogtest.Make(t, nil)
logger :=testutil.Logger(t)
flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
_ = flags.Bool("tls-redirect-http-to-https", true, "")
err := flags.Parse(tc.flags)
Expand Down
4 changes: 1 addition & 3 deletionscli/server_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,6 @@ import (
"tailscale.com/derp/derphttp"
"tailscale.com/types/key"

"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/cli"
"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/cli/config"
Expand DownExpand Up@@ -1833,7 +1831,7 @@ func TestConnectToPostgres(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
t.Cleanup(cancel)

log :=slogtest.Make(t, nil)
log :=testutil.Logger(t)

dbURL, err := dbtestutil.Open(t)
require.NoError(t, err)
Expand Down
6 changes: 2 additions & 4 deletionscli/speedtest_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,8 +9,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/cli"
"github.com/coder/coder/v2/cli/clitest"
Expand DownExpand Up@@ -52,7 +50,7 @@ func TestSpeedtest(t *testing.T) {
ctx, cancel = context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

inv.Logger =slogtest.Make(t, nil).Named("speedtest").Leveled(slog.LevelDebug)
inv.Logger =testutil.Logger(t).Named("speedtest")
cmdDone := tGo(t, func() {
err := inv.WithContext(ctx).Run()
assert.NoError(t, err)
Expand DownExpand Up@@ -90,7 +88,7 @@ func TestSpeedtestJson(t *testing.T) {
ctx, cancel = context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()

inv.Logger =slogtest.Make(t, nil).Named("speedtest").Leveled(slog.LevelDebug)
inv.Logger =testutil.Logger(t).Named("speedtest")
cmdDone := tGo(t, func() {
err := inv.WithContext(ctx).Run()
assert.NoError(t, err)
Expand Down
6 changes: 3 additions & 3 deletionscli/ssh_internal_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,7 @@ func TestBuildWorkspaceLink(t *testing.T) {
func TestCloserStack_Mainline(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitShort)
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
uut := newCloserStack(ctx, logger, quartz.NewMock(t))
closes := new([]*fakeCloser)
fc0 := &fakeCloser{closes: closes}
Expand All@@ -90,7 +90,7 @@ func TestCloserStack_Mainline(t *testing.T) {
func TestCloserStack_Empty(t *testing.T) {
t.Parallel()
ctx := testutil.Context(t, testutil.WaitShort)
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
uut := newCloserStack(ctx, logger, quartz.NewMock(t))

closed := make(chan struct{})
Expand All@@ -106,7 +106,7 @@ func TestCloserStack_Context(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitShort)
ctx, cancel := context.WithCancel(ctx)
defer cancel()
logger :=slogtest.Make(t, nil).Leveled(slog.LevelDebug)
logger :=testutil.Logger(t)
uut := newCloserStack(ctx, logger, quartz.NewMock(t))
closes := new([]*fakeCloser)
fc0 := &fakeCloser{closes: closes}
Expand Down
11 changes: 4 additions & 7 deletionscli/ssh_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,9 +30,6 @@ import (
"golang.org/x/sync/errgroup"
"golang.org/x/xerrors"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agentssh"
"github.com/coder/coder/v2/agent/agenttest"
Expand All@@ -57,7 +54,7 @@ func setupWorkspaceForAgent(t *testing.T, mutations ...func([]*proto.Agent) []*p
t.Helper()

client, store := coderdtest.NewWithDatabase(t, nil)
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
client.SetLogger(testutil.Logger(t).Named("client"))
first := coderdtest.CreateFirstUser(t, client)
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
r := dbfake.WorkspaceBuild(t, store, database.WorkspaceTable{
Expand DownExpand Up@@ -257,7 +254,7 @@ func TestSSH(t *testing.T) {

store, ps := dbtestutil.NewDB(t)
client := coderdtest.New(t, &coderdtest.Options{Pubsub: ps, Database: store})
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
client.SetLogger(testutil.Logger(t).Named("client"))
first := coderdtest.CreateFirstUser(t, client)
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
r := dbfake.WorkspaceBuild(t, store, database.WorkspaceTable{
Expand DownExpand Up@@ -760,7 +757,7 @@ func TestSSH(t *testing.T) {

store, ps := dbtestutil.NewDB(t)
client := coderdtest.New(t, &coderdtest.Options{Pubsub: ps, Database: store})
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
client.SetLogger(testutil.Logger(t).Named("client"))
first := coderdtest.CreateFirstUser(t, client)
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
r := dbfake.WorkspaceBuild(t, store, database.WorkspaceTable{
Expand DownExpand Up@@ -1367,7 +1364,7 @@ func TestSSH(t *testing.T) {
DeploymentValues: dv,
StatsBatcher: batcher,
})
admin.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
admin.SetLogger(testutil.Logger(t).Named("client"))
first := coderdtest.CreateFirstUser(t, admin)
client, user := coderdtest.CreateAnotherUser(t, admin, first.OrganizationID)
r := dbfake.WorkspaceBuild(t, store, database.WorkspaceTable{
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp