Merge pull request #6720 from zhzhuang-zju/upstream/rbsuspension

fix wrong test name

Author: karmada-bot

pkg/util/binding.go

@@ -113,20 +113,20 @@ func RescheduleRequired(rescheduleTriggeredAt, lastScheduledTime *metav1.Time) b
 
 // MergePolicySuspension merges the suspension configuration from policy to binding suspension.
 func MergePolicySuspension(bindingSuspension *workv1alpha2.Suspension, policySuspension *policyv1alpha1.Suspension) *workv1alpha2.Suspension {
-	if bindingSuspension == nil && policySuspension == nil {
-		return nil
-	}
-
-	if policySuspension != nil { // have to sync policy suspension to binding
+	if policySuspension != nil {
 		if bindingSuspension == nil {
 			bindingSuspension = &workv1alpha2.Suspension{}
 		}
 		bindingSuspension.Suspension = *policySuspension
-	} else { // have to clean suspension previous synced to binding if any
-		bindingSuspension.Suspension = policyv1alpha1.Suspension{}
-		if bindingSuspension.Scheduling == nil { // if the scheduling not set, no need to keep an empty struct
-			bindingSuspension = nil
-		}
+		return bindingSuspension
+	}
+	// policySuspension is nil, clean up binding's suspension part.
+	if bindingSuspension == nil {
+		return nil
+	}
+	bindingSuspension.Suspension = policyv1alpha1.Suspension{}
+	if bindingSuspension.Scheduling == nil {
+		return nil
 	}
 	return bindingSuspension
 }

pkg/util/binding_test.go

@@ -445,7 +445,7 @@ func TestMergePolicySuspension(t *testing.T) {
 			},
 		},
 		{
-			name: "binding suspension only preserves scheduling when policy suspension nil",
+			name: "cleanup of binding suspension preserves scheduling field",
 			bindingSuspension: &workv1alpha2.Suspension{
 				Suspension: policyv1alpha1.Suspension{
 					Dispatching: ptr.To(true),
@@ -499,7 +499,7 @@ func TestMergePolicySuspension(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			got := MergePolicySuspension(tt.bindingSuspension, tt.policySuspension)
 			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("UpdateBindingSuspension() got = %v, want %v", got, tt.want)
+				t.Errorf("MergePolicySuspension() got = %v, want %v", got, tt.want)
 			}
 		})
 	}