daemon: update reconciler tests for StatusWatcher cache

Each unit test creates its own watcher with a fresh cache via
newTestEnv() to avoid test pollution.

Assisted-by: AI
Signed-off-by: Alice Frosi <afrosi@redhat.com>

Author: alicefr

cmd/daemon/main.go

@@ -70,12 +70,12 @@ func main() {
 	executor := bootc.NewHostExecutor()
 
 	watcher := &daemon.StatusWatcher{
-		PollInterval: pollInterval,
+		PollInterval:  pollInterval,
 		OstreePath:    daemon.DefaultOstreePath,
 		ComposefsPath: daemon.DefaultComposefsPath,
-		Events:       make(chan event.GenericEvent, 1),
-		NodeName:     nodeName,
-		Executor:     executor,
+		Events:        make(chan event.GenericEvent, 1),
+		NodeName:      nodeName,
+		Executor:      executor,
 	}
 	if err := mgr.Add(watcher); err != nil {
 		setupLog.Error(err, "Failed to add status watcher")

internal/daemon/reconciler_test.go

@@ -32,6 +32,8 @@ func TestReconcilePopulatesStatus(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
+	fake := newTestEnv()
+
 	v1 := "v1"
 	v2 := "v2"
 	v3 := "v3"
@@ -99,7 +101,7 @@ func TestReconcileBootcStatusError(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.setStatusErr(errors.New(bootcStatusErrMsg))
 
 	bn := testutil.NewNode(testNodeName, testutil.ImageDigestRefA)
@@ -126,7 +128,7 @@ func TestStagingTriggered(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.status = newBootcStatus(testutil.DigestA)
 
 	bn := testutil.NewNode(testNodeName, testutil.ImageDigestRefB)
@@ -163,7 +165,7 @@ func TestStagingError(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.status = newBootcStatus(testutil.DigestA)
 	fake.setStageErr(errors.New(stageErrMsg))
 
@@ -196,7 +198,7 @@ func TestAlreadyStaged(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.status = newBootcStatus(testutil.DigestA)
 	fake.status.Status.Staged = newBootEntry(testutil.ImageDigestRefB, testutil.DigestB)
 
@@ -225,7 +227,7 @@ func TestRebootingSet(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.status = newBootcStatus(testutil.DigestA)
 	fake.status.Status.Staged = newBootEntry(testutil.ImageDigestRefB, testutil.DigestB)
 
@@ -254,7 +256,7 @@ func TestRollback(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.status = newBootcStatus(testutil.DigestA)
 	fake.status.Status.Staged = newBootEntry(testutil.ImageDigestRefB, testutil.DigestB)
 
@@ -285,7 +287,7 @@ func TestCancelInflightStage(t *testing.T) {
 	g.SetDefaultEventuallyPollingInterval(pollInterval)
 	ctx := context.Background()
 
-	resetDaemon()
+	fake := newTestEnv()
 	fake.status = newBootcStatus(testutil.DigestA)
 
 	firstBlock := make(chan struct{})

internal/daemon/suite_test.go

@@ -13,6 +13,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
@@ -22,20 +23,11 @@ import (
 const testNodeName = "test-node"
 
 var (
-	testEnv    *envtest.Environment
-	k8sClient  client.Client
-	fake       *fakeExecutor
-	reconciler *BootcNodeReconciler
+	testEnv        *envtest.Environment
+	k8sClient      client.Client
+	testReconciler *BootcNodeReconciler
 )
 
-// resetDaemon resets all volatile state on the shared reconciler and
-// fake executor so each test starts from a clean slate.
-func resetDaemon() {
-	fake.reset()
-	reconciler.rebootIssued = false
-	reconciler.inflight.reset()
-}
-
 func TestMain(m *testing.M) {
 	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
 
@@ -61,8 +53,6 @@ func TestMain(m *testing.M) {
 		os.Exit(1)
 	}
 
-	fake = &fakeExecutor{}
-
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
 		Scheme: scheme.Scheme,
 		Metrics: metricsserver.Options{
@@ -74,13 +64,23 @@ func TestMain(m *testing.M) {
 		os.Exit(1)
 	}
 
-	reconciler = &BootcNodeReconciler{
+	fake := &fakeExecutor{}
+	testReconciler = &BootcNodeReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		NodeName: testNodeName,
 		Executor: fake,
+		StatusWatcher: &StatusWatcher{
+			Events:   make(chan event.GenericEvent, 1),
+			NodeName: testNodeName,
+			Executor: fake,
+		},
+	}
+	if err := mgr.Add(testReconciler.StatusWatcher); err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to add status watcher: %v\n", err)
+		os.Exit(1)
 	}
-	if err := reconciler.SetupWithManager(mgr); err != nil {
+	if err := testReconciler.SetupWithManager(mgr); err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to setup reconciler: %v\n", err)
 		os.Exit(1)
 	}
@@ -107,3 +107,18 @@ func TestMain(m *testing.M) {
 
 	os.Exit(code)
 }
+
+// newTestEnv creates a fresh fakeExecutor and StatusWatcher for a test,
+// wiring them into the shared reconciler. Each test gets its own cache.
+func newTestEnv() *fakeExecutor {
+	fake := &fakeExecutor{}
+	testReconciler.Executor = fake
+	testReconciler.rebootIssued = false
+	testReconciler.inflight.reset()
+	testReconciler.StatusWatcher = &StatusWatcher{
+		Events:   testReconciler.StatusWatcher.Events,
+		NodeName: testNodeName,
+		Executor: fake,
+	}
+	return fake
+}