Fix another flaky test

PiperOrigin-RevId: 942178702

Author: Copybara Service

fleetspeak/src/server/spanner/broadcaststore.go

@@ -229,9 +229,11 @@ func (d *Datastore) ListActiveBroadcasts(ctx context.Context) ([]*db.BroadcastIn
 			"b.MessageLimit " +
 			"FROM Broadcasts AS b " +
 			"WHERE b.Sent < b.MessageLimit " +
-			"AND (b.Broadcast.expiration_time IS NULL OR (b.Broadcast.expiration_time.seconds > @nowSec))",
+			"AND (b.Broadcast.expiration_time IS NULL OR (b.Broadcast.expiration_time.seconds > @nowSec) " +
+			"OR (b.Broadcast.expiration_time.seconds = @nowSec AND b.Broadcast.expiration_time.nanos > @nowNano))",
 		Params: map[string]any{
-			"nowSec": int64(now.Seconds),
+			"nowSec":  int64(now.Seconds),
+			"nowNano": int64(now.Nanos),
 		},
 	}
 

fleetspeak/src/server/spanner/spanner_test.go

@@ -87,8 +87,14 @@ func (e *spannerTestEnv) Clean() (db.Store, error) {
 	e.current = s
 	m := []*spanner.Mutation{
 		spanner.Delete(s.clients, spanner.AllKeys()),
+		spanner.Delete(s.clientLabels, spanner.AllKeys()),
+		spanner.Delete(s.clientContacts, spanner.AllKeys()),
+		spanner.Delete(s.clientContactMessages, spanner.AllKeys()),
 		spanner.Delete(s.messages, spanner.AllKeys()),
+		spanner.Delete(s.clientPendingMessages, spanner.AllKeys()),
+		spanner.Delete(s.clientResourceUsageRecords, spanner.AllKeys()),
 		spanner.Delete(s.broadcasts, spanner.AllKeys()),
+		spanner.Delete(s.broadcastAllocations, spanner.AllKeys()),
 		spanner.Delete(s.broadcastSent, spanner.AllKeys()),
 		spanner.Delete(s.files, spanner.AllKeys()),
 	}