@@ -179,31 +179,24 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
179179defer cancel ()
180180
181181// given
182- agent := mustCreateAgentWithLogs (ctx ,t ,db ,user ,org ,tmpl ,tv ,now .Add (- 8 * 24 * time .Hour ),t .Name ())
183-
184- // Make sure that agent logs have been collected.
185- agentLogs ,err := db .GetWorkspaceAgentLogsAfter (ctx , database.GetWorkspaceAgentLogsAfterParams {
186- AgentID :agent ,
187- })
188- require .NoError (t ,err )
189- require .NotZero (t ,agentLogs ,"agent logs must be present" )
182+ agent1 := mustCreateAgentWithLogs (ctx ,t ,db ,user ,org ,tmpl ,tv ,now .Add (- 8 * 24 * time .Hour ),t .Name ()+ "-1" )
190183
191184// when
192185closer := dbpurge .New (ctx ,logger ,db )
193186defer closer .Close ()
194187
195188// then
196189assert .Eventually (t ,func ()bool {
197- agentLogs ,err = db .GetWorkspaceAgentLogsAfter (ctx , database.GetWorkspaceAgentLogsAfterParams {
198- AgentID :agent ,
190+ agentLogs ,err : =db .GetWorkspaceAgentLogsAfter (ctx , database.GetWorkspaceAgentLogsAfterParams {
191+ AgentID :agent1 ,
199192})
200193if err != nil {
201194return false
202195}
196+ assert .NoError (t ,err )
197+ assert .NotContains (t ,agentLogs ,t .Name ())
203198return ! containsAgentLog (agentLogs ,t .Name ())
204199},testutil .WaitShort ,testutil .IntervalFast )
205- require .NoError (t ,err )
206- require .NotContains (t ,agentLogs ,t .Name ())
207200})
208201
209202//nolint:paralleltest // It uses LockIDDBPurge.
@@ -246,6 +239,12 @@ func mustCreateAgentWithLogs(ctx context.Context, t *testing.T, db database.Stor
246239Level : []database.LogLevel {database .LogLevelDebug },
247240})
248241require .NoError (t ,err )
242+ // Make sure that agent logs have been collected.
243+ agentLogs ,err := db .GetWorkspaceAgentLogsAfter (ctx , database.GetWorkspaceAgentLogsAfterParams {
244+ AgentID :agent .ID ,
245+ })
246+ require .NoError (t ,err )
247+ require .NotZero (t ,agentLogs ,"agent logs must be present" )
249248return agent .ID
250249}
251250
@@ -268,6 +267,7 @@ func mustCreateAgent(t *testing.T, db database.Store, user database.User, org da
268267JobID :job .ID ,
269268Transition :database .WorkspaceTransitionStart ,
270269})
270+
271271return dbgen .WorkspaceAgent (t ,db , database.WorkspaceAgent {
272272ResourceID :resource .ID ,
273273})