test: fix tests

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
red-hat-storage · Jan 15, 2025 · 5f19e3a · 5f19e3a
1 parent 930ddc9
commit 5f19e3a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/controllers/delete_test.go b/controllers/delete_test.go
@@ -87,7 +87,7 @@ func TestDeleteResources(t *testing.T) {
 			assert.NoError(t, err)
 		}
 
-		err = fakeReconciler.deleteResources(fakeStorageSystem, fakeReconciler.Log)
+		err = fakeReconciler.deleteResources(fakeStorageSystem, fakeLogger)
 		assert.True(t, (tc.expectedError == (err != nil)))
 
 		// verify resource does not exist

diff --git a/controllers/quickstarts_test.go b/controllers/quickstarts_test.go
@@ -63,7 +63,7 @@ func TestEnsureQuickStarts(t *testing.T) {
 	}
 
 	fakeReconciler := GetFakeStorageSystemReconciler(t)
-	err := fakeReconciler.ensureQuickStarts(fakeReconciler.Log)
+	err := fakeReconciler.ensureQuickStarts(fakeLogger)
 	assert.NoError(t, err)
 	for _, c := range cases {
 		qs := consolev1.ConsoleQuickStart{}
@@ -143,7 +143,7 @@ func TestDeleteQuickStarts(t *testing.T) {
 
 		fakeReconciler := GetFakeStorageSystemReconciler(t)
 
-		err := fakeReconciler.ensureQuickStarts(fakeReconciler.Log)
+		err := fakeReconciler.ensureQuickStarts(fakeLogger)
 		assert.NoError(t, err)
 
 		var quickstarts []consolev1.ConsoleQuickStart = getActualQuickStarts(t, cases, fakeReconciler)
@@ -156,7 +156,7 @@ func TestDeleteQuickStarts(t *testing.T) {
 		for i := range tc.deleteStorageSystems {
 			err := fakeReconciler.Client.Delete(context.TODO(), &tc.deleteStorageSystems[i])
 			assert.NoError(t, err)
-			err = fakeReconciler.deleteResources(&tc.deleteStorageSystems[i], fakeReconciler.Log)
+			err = fakeReconciler.deleteResources(&tc.deleteStorageSystems[i], fakeLogger)
 			assert.NoError(t, err)
 		}
 		quickstarts = getActualQuickStarts(t, cases, fakeReconciler)

diff --git a/controllers/storagesystem_controller_fake.go b/controllers/storagesystem_controller_fake.go
@@ -34,6 +34,10 @@ import (
 	odfv1alpha1 "github.com/red-hat-storage/odf-operator/api/v1alpha1"
 )
 
+var (
+	fakeLogger = ctrl.Log.WithName("test-controllers").WithName("StorageSystem")
+)
+
 func GetFakeStorageSystem(kind odfv1alpha1.StorageKind) *odfv1alpha1.StorageSystem {
 	return &odfv1alpha1.StorageSystem{
 		ObjectMeta: metav1.ObjectMeta{
@@ -53,7 +57,6 @@ func GetFakeStorageSystemReconciler(t *testing.T, objs ...runtime.Object) *Stora
 	scheme := createFakeScheme(t)
 	fakeStorageSystemReconciler := &StorageSystemReconciler{
 		Client:   fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(objs...).Build(),
-		Log:      ctrl.Log.WithName("controllers").WithName("StorageSystem"),
 		Scheme:   scheme,
 		Recorder: NewEventReporter(record.NewFakeRecorder(1024)),
 	}

diff --git a/controllers/subscriptions_test.go b/controllers/subscriptions_test.go
@@ -99,7 +99,7 @@ func TestEnsureSubscription(t *testing.T) {
 			err = fakeReconciler.Client.Create(context.TODO(), odfSub)
 			assert.NoError(t, err)
 
-			err = fakeReconciler.ensureSubscriptions(fakeStorageSystem, fakeReconciler.Log)
+			err = fakeReconciler.ensureSubscriptions(fakeStorageSystem, fakeLogger)
 			assert.NoError(t, err)
 
 			for _, expectedSubscription := range subs {

diff --git a/controllers/vendors_test.go b/controllers/vendors_test.go
@@ -66,7 +66,7 @@ func TestIsVendorSystemPresent(t *testing.T) {
 			assert.NoError(t, err)
 		}
 
-		err := fakeReconciler.isVendorSystemPresent(fakeStorageSystem, fakeReconciler.Log)
+		err := fakeReconciler.isVendorSystemPresent(fakeStorageSystem, fakeLogger)
 
 		assert.Equal(t, tc.hasBackEndStorage,
 			conditionsv1.IsStatusConditionTrue(