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

Commit0e6fdae

Browse files
committed
Merge branch 'main' of github.com:/coder/coder into dk/system-notifications-o11y
Signed-off-by: Danny Kopping <danny@coder.com>
2 parentsf96ce2a +bdd2caf commit0e6fdae

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

‎coderd/database/dbpurge/dbpurge_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/google/uuid"
14+
"github.com/stretchr/testify/assert"
1415
"github.com/stretchr/testify/require"
1516
"go.uber.org/goleak"
1617
"golang.org/x/exp/slices"
@@ -183,20 +184,29 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
183184
// given
184185
agent:=mustCreateAgentWithLogs(ctx,t,db,user,org,tmpl,tv,now.Add(-8*24*time.Hour),t.Name())
185186

187+
// Make sure that agent logs have been collected.
188+
agentLogs,err:=db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
189+
AgentID:agent,
190+
})
191+
require.NoError(t,err)
192+
require.NotZero(t,agentLogs,"agent logs must be present")
193+
186194
// when
187195
closer:=dbpurge.New(ctx,logger,db)
188196
defercloser.Close()
189197

190198
// then
191-
require.Eventually(t,func()bool {
192-
agentLogs,err:=db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
199+
assert.Eventually(t,func()bool {
200+
agentLogs,err=db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
193201
AgentID:agent,
194202
})
195203
iferr!=nil {
196204
returnfalse
197205
}
198206
return!containsAgentLog(agentLogs,t.Name())
199207
},testutil.WaitShort,testutil.IntervalFast)
208+
require.NoError(t,err)
209+
require.NotContains(t,agentLogs,t.Name())
200210
})
201211

202212
t.Run("AgentConnectedSixDaysAgo_LogsValid",func(t*testing.T) {

‎coderd/notifications/manager_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import (
77
"testing"
88
"time"
99

10+
"github.com/coder/serpent"
1011
"github.com/google/uuid"
1112
"github.com/stretchr/testify/assert"
1213
"github.com/stretchr/testify/require"
1314
"golang.org/x/xerrors"
1415

15-
"github.com/coder/serpent"
16-
1716
"cdr.dev/slog"
1817
"cdr.dev/slog/sloggers/slogtest"
1918

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp