Fix failing tests

server/datastore/mysql/labels_test.go

@@ -69,6 +69,8 @@ func TestLabels(t *testing.T) {
 		{"HostMemberOfAllLabels", testHostMemberOfAllLabels},
 		{"ListHostsInLabelOSSettings", testLabelsListHostsInLabelOSSettings},
 	}
+	// call TruncateTables first to remove migration-created labels
+	TruncateTables(t, ds)
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
 			defer TruncateTables(t, ds)
@@ -92,15 +94,13 @@ func testLabelsAddAllHosts(deferred bool, t *testing.T, db *Datastore) {
 	err = db.UpdateHost(context.Background(), host)
 	require.NoError(t, err)
 
-	// No labels to check
 	queries, err := db.LabelQueriesForHost(context.Background(), host)
 	assert.Nil(t, err)
 	assert.Len(t, queries, 0)
 
-	// Only 'All Hosts' label should be returned
 	labels, err := db.ListLabelsForHost(context.Background(), host.ID)
 	assert.Nil(t, err)
-	assert.Len(t, labels, 1)
+	assert.Len(t, labels, 1) // all hosts only
 
 	newLabels := []*fleet.LabelSpec{
 		// Note these are intentionally out of order
@@ -1429,3 +1429,14 @@ func testLabelsListHostsInLabelOSSettings(t *testing.T, db *Datastore) {
 		checkHosts(t, hosts, []uint{h2.ID})
 	})
 }
+
+func labelIDFromName(t *testing.T, ds fleet.Datastore, name string) uint {
+	allLbls, err := ds.ListLabels(context.Background(), fleet.TeamFilter{User: test.UserAdmin}, fleet.ListOptions{})
+	require.Nil(t, err)
+	for _, lbl := range allLbls {
+		if lbl.Name == name {
+			return lbl.ID
+		}
+	}
+	return 0
+}

server/datastore/mysql/statistics_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/fleetdm/fleet/v4/server/contexts/license"
 	"github.com/fleetdm/fleet/v4/server/fleet"
 	"github.com/fleetdm/fleet/v4/server/ptr"
+	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -49,6 +50,11 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
 	premiumLicense := &fleet.LicenseInfo{Tier: fleet.TierPremium, Organization: "Fleet"}
 	freeLicense := &fleet.LicenseInfo{Tier: fleet.TierFree}
 
+	var builtinLabels int
+	ExecAdhocSQL(t, ds, func(q sqlx.ExtContext) error {
+		return sqlx.GetContext(ctx, q, &builtinLabels, `SELECT COUNT(*) FROM labels`)
+	})
+
 	// First time running with no hosts
 	stats, shouldSend, err := ds.ShouldSendStatistics(license.NewContext(ctx, premiumLicense), time.Millisecond, fleetConfig)
 	require.NoError(t, err)
@@ -59,7 +65,7 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
 	assert.Equal(t, 0, stats.NumUsers)
 	assert.Equal(t, 0, stats.NumTeams)
 	assert.Equal(t, 0, stats.NumPolicies)
-	assert.Equal(t, 0, stats.NumLabels)
+	assert.Equal(t, builtinLabels, stats.NumLabels)
 	assert.Equal(t, false, stats.SoftwareInventoryEnabled)
 	assert.Equal(t, true, stats.SystemUsersEnabled)
 	assert.Equal(t, false, stats.VulnDetectionEnabled)
@@ -193,7 +199,7 @@ func testStatisticsShouldSend(t *testing.T, ds *Datastore) {
 	assert.Equal(t, 2, stats.NumUsers)
 	assert.Equal(t, 1, stats.NumTeams)
 	assert.Equal(t, 1, stats.NumPolicies)
-	assert.Equal(t, 1, stats.NumLabels)
+	assert.Equal(t, builtinLabels+1, stats.NumLabels)
 	assert.Equal(t, false, stats.SoftwareInventoryEnabled)
 	assert.Equal(t, false, stats.SystemUsersEnabled)
 	assert.Equal(t, false, stats.VulnDetectionEnabled)

server/datastore/mysql/targets_test.go

@@ -76,16 +76,16 @@ func testTargetsCountHosts(t *testing.T, ds *Datastore) {
 	h6 := initHost(mockClock.Now().Add(thirtyDaysAndAMinuteAgo*time.Minute), 3600, 3600, nil)
 
 	l1 := fleet.LabelSpec{
-		ID:    1,
 		Name:  "label foo",
 		Query: "query foo",
 	}
 	l2 := fleet.LabelSpec{
-		ID:    2,
 		Name:  "label bar",
 		Query: "query bar",
 	}
 	require.NoError(t, ds.ApplyLabelSpecs(context.Background(), []*fleet.LabelSpec{&l1, &l2}))
+	l1.ID = labelIDFromName(t, ds, l1.Name)
+	l2.ID = labelIDFromName(t, ds, l2.Name)
 
 	for _, h := range []*fleet.Host{h1, h2, h3, h6} {
 		err = ds.RecordLabelQueryExecutions(context.Background(), h, map[uint]*bool{l1.ID: ptr.Bool(true)}, mockClock.Now(), false)

server/datastore/mysql/unicode_test.go

@@ -18,12 +18,12 @@ func TestUnicode(t *testing.T) {
 	defer ds.Close()
 
 	l1 := fleet.LabelSpec{
-		ID:    1,
 		Name:  "測試",
 		Query: "query foo",
 	}
 	err := ds.ApplyLabelSpecs(context.Background(), []*fleet.LabelSpec{&l1})
 	require.Nil(t, err)
+	l1.ID = labelIDFromName(t, ds, l1.Name)
 
 	label, err := ds.Label(context.Background(), l1.ID)
 	require.Nil(t, err)