Merge remote-tracking branch 'upstream/main' into becca/runner-rungroup

ee/agent/timemachine/timemachine_darwin_test.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/kolide/launcher/ee/agent/types/mocks"
 	"github.com/kolide/launcher/ee/allowedcmd"
@@ -81,6 +82,11 @@ func TestAddExclusions(t *testing.T) {
 
 	AddExclusions(context.TODO(), knapsack)
 
+	// we've seen some flake in CI here where the exclusions have not been
+	// updated by the time we perform assertions, so sleep for a bit to give
+	// OS some time to catch up
+	time.Sleep(1 * time.Second)
+
 	// ensure the files are included / excluded as expected
 	for fileName, shouldBeExcluded := range shouldBeExcluded {
 		cmd, err := allowedcmd.Tmutil(context.TODO(), "isexcluded", filepath.Join(testDir, fileName))