test: simplify client initialization in failure tests

Simplifies the `finalClient` initialization logic in `TestMultigresClusterReconciler_Reconcile_Failure` by removing an unnecessary `else` block.

The client is now initialized with the default `baseClient` upfront, and conditionally wrapped with `NewFakeClientWithFailures` only if a failure configuration is present. This reduces indentation and makes the default behavior more explicit.

Author: fernando-villalba

pkg/cluster-handler/controller/multigrescluster/multigrescluster_controller_test.go

@@ -137,6 +137,7 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
 		multigrescluster   *multigresv1alpha1.MultigresCluster
 		existingObjects    []client.Object
 		preReconcileUpdate func(testing.TB, *multigresv1alpha1.MultigresCluster)
+		setupFunc          func(testing.TB, client.Client)
 		validate           func(testing.TB, client.Client)
 	}{
 		"Create: Adds Finalizer": {
@@ -478,15 +479,20 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
 			preReconcileUpdate: func(t testing.TB, c *multigresv1alpha1.MultigresCluster) {
 				c.Spec.Databases = append(c.Spec.Databases, multigresv1alpha1.DatabaseConfig{Name: "db2", TableGroups: []multigresv1alpha1.TableGroupConfig{}})
 			},
-			existingObjects: []client.Object{
-				coreTpl, cellTpl, shardTpl,
-				&multigresv1alpha1.Cell{
+			existingObjects: []client.Object{coreTpl, cellTpl, shardTpl},
+			setupFunc: func(t testing.TB, c client.Client) {
+				ctx := t.Context()
+				cell := &multigresv1alpha1.Cell{
 					ObjectMeta: metav1.ObjectMeta{Name: clusterName + "-zone-a", Namespace: namespace, Labels: map[string]string{"multigres.com/cluster": clusterName}},
 					Spec:       multigresv1alpha1.CellSpec{Name: "zone-a"},
-					Status: multigresv1alpha1.CellStatus{
-						Conditions: []metav1.Condition{{Type: "Available", Status: metav1.ConditionTrue}},
-					},
-				},
+				}
+				if err := c.Create(ctx, cell); err != nil {
+					t.Fatalf("failed to create cell: %v", err)
+				}
+				cell.Status.Conditions = []metav1.Condition{{Type: "Available", Status: metav1.ConditionTrue}}
+				if err := c.Status().Update(ctx, cell); err != nil {
+					t.Fatalf("failed to update cell status: %v", err)
+				}
 			},
 			validate: func(t testing.TB, c client.Client) {
 				cluster := &multigresv1alpha1.MultigresCluster{}
@@ -543,6 +549,10 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
 			var finalClient client.Client
 			finalClient = baseClient
 
+			if tc.setupFunc != nil {
+				tc.setupFunc(t, baseClient)
+			}
+
 			// Apply pre-reconcile updates if defined
 			if tc.preReconcileUpdate != nil {
 				tc.preReconcileUpdate(t, tc.multigrescluster)
@@ -1010,10 +1020,9 @@ func TestMultigresClusterReconciler_Reconcile_Failure(t *testing.T) {
 			baseClient := clientBuilder.Build()
 
 			var finalClient client.Client
+			finalClient = client.Client(baseClient)
 			if tc.failureConfig != nil {
 				finalClient = testutil.NewFakeClientWithFailures(baseClient, tc.failureConfig)
-			} else {
-				finalClient = baseClient
 			}
 
 			// Apply pre-reconcile updates if defined