chore(coderd/database/dbpurge): move check for agent logs inside mustCreateAgentWithLogs

johnstcn · johnstcn · commit 208f276f1461 · 2024-08-29T16:58:31.000+01:00
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
@@ -179,31 +179,24 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
 		defer cancel()
 
 		// given
-		agent := mustCreateAgentWithLogs(ctx, t, db, user, org, tmpl, tv, now.Add(-8*24*time.Hour), t.Name())
-
-		// Make sure that agent logs have been collected.
-		agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
-			AgentID: agent,
-		})
-		require.NoError(t, err)
-		require.NotZero(t, agentLogs, "agent logs must be present")
+		agent1 := mustCreateAgentWithLogs(ctx, t, db, user, org, tmpl, tv, now.Add(-8*24*time.Hour), t.Name()+"-1")
 
 		// when
 		closer := dbpurge.New(ctx, logger, db)
 		defer closer.Close()
 
 		// then
 		assert.Eventually(t, func() bool {
-			agentLogs, err = db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
-				AgentID: agent,
+			agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
+				AgentID: agent1,
 			})
 			if err != nil {
 				return false
 			}
+			assert.NoError(t, err)
+			assert.NotContains(t, agentLogs, t.Name())
 			return !containsAgentLog(agentLogs, t.Name())
 		}, testutil.WaitShort, testutil.IntervalFast)
-		require.NoError(t, err)
-		require.NotContains(t, agentLogs, t.Name())
 	})
 
 	//nolint:paralleltest // It uses LockIDDBPurge.
@@ -246,6 +239,12 @@ func mustCreateAgentWithLogs(ctx context.Context, t *testing.T, db database.Stor
 		Level:     []database.LogLevel{database.LogLevelDebug},
 	})
 	require.NoError(t, err)
+	// Make sure that agent logs have been collected.
+	agentLogs, err := db.GetWorkspaceAgentLogsAfter(ctx, database.GetWorkspaceAgentLogsAfterParams{
+		AgentID: agent.ID,
+	})
+	require.NoError(t, err)
+	require.NotZero(t, agentLogs, "agent logs must be present")
 	return agent.ID
 }
 
@@ -268,6 +267,7 @@ func mustCreateAgent(t *testing.T, db database.Store, user database.User, org da
 		JobID:      job.ID,
 		Transition: database.WorkspaceTransitionStart,
 	})
+
 	return dbgen.WorkspaceAgent(t, db, database.WorkspaceAgent{
 		ResourceID: resource.ID,
 	})
