@@ -447,22 +447,6 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
447447 }
448448 },
449449 },
450- "Create: No Global Topo Config" : {
451- preReconcileUpdate : func (t testing.TB , c * multigresv1alpha1.MultigresCluster ) {
452- c .Spec .GlobalTopoServer = multigresv1alpha1.GlobalTopoServerSpec {} // Empty
453- c .Spec .TemplateDefaults = multigresv1alpha1.TemplateDefaults {} // Empty
454- c .Spec .MultiAdmin = multigresv1alpha1.MultiAdminConfig {} // Empty
455- },
456- // Using defaults (coreTpl presence doesn't hurt)
457- validate : func (t testing.TB , c client.Client ) {
458- // Verify Cell got empty topo address
459- cell := & multigresv1alpha1.Cell {}
460- _ = c .Get (t .Context (), types.NamespacedName {Name : clusterName + "-zone-a" , Namespace : namespace }, cell )
461- if got , want := cell .Spec .GlobalTopoServer .Address , "" ; got != want {
462- t .Errorf ("Expected empty topo address mismatch got %q, want %q" , got , want )
463- }
464- },
465- },
466450 "Status: Aggregation Logic" : {
467451 preReconcileUpdate : func (t testing.TB , c * multigresv1alpha1.MultigresCluster ) {
468452 c .Spec .Databases = append (c .Spec .Databases , multigresv1alpha1.DatabaseConfig {Name : "db2" , TableGroups : []multigresv1alpha1.TableGroupConfig {}})
@@ -534,6 +518,8 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
534518 }
535519
536520 // Inject cluster into existingObjects if creation is not skipped
521+ // This handles initializing the fake client with the cluster state,
522+ // including DeletionTimestamp if set by preReconcileUpdate.
537523 if ! tc .skipClusterCreation {
538524 objects = append (objects , cluster )
539525 }
@@ -544,7 +530,8 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
544530 WithStatusSubresource (& multigresv1alpha1.MultigresCluster {}, & multigresv1alpha1.Cell {}, & multigresv1alpha1.TableGroup {})
545531 baseClient := clientBuilder .Build ()
546532
547- finalClient := baseClient
533+ var finalClient client.Client
534+ finalClient = baseClient
548535
549536 reconciler := & MultigresClusterReconciler {
550537 Client : finalClient ,
@@ -559,7 +546,6 @@ func TestMultigresClusterReconciler_Reconcile_Success(t *testing.T) {
559546 }
560547
561548 _ , err := reconciler .Reconcile (t .Context (), req )
562-
563549 if err != nil {
564550 t .Errorf ("Unexpected error from Reconcile: %v" , err )
565551 }
@@ -933,7 +919,7 @@ func TestMultigresClusterReconciler_Reconcile_Failure(t *testing.T) {
933919 baseClient := clientBuilder .Build ()
934920
935921 var finalClient client.Client
936- finalClient = client . Client ( baseClient )
922+ finalClient = baseClient
937923 if tc .failureConfig != nil {
938924 finalClient = testutil .NewFakeClientWithFailures (baseClient , tc .failureConfig )
939925 }
@@ -951,7 +937,6 @@ func TestMultigresClusterReconciler_Reconcile_Failure(t *testing.T) {
951937 }
952938
953939 _ , err := reconciler .Reconcile (t .Context (), req )
954-
955940 if err == nil {
956941 t .Error ("Expected error from Reconcile, got nil" )
957942 }
0 commit comments