Fix incorrect error code judgment in e2e tests

Signed-off-by: whitewindmills <[email protected]>
whitewindmills · Jul 30, 2024 · 5759315 · 5759315
1 parent 3a4861f
commit 5759315
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/test/e2e/failover_test.go b/test/e2e/failover_test.go
@@ -528,9 +528,6 @@ func disableCluster(c client.Client, clusterName string) error {
 	err := wait.PollUntilContextTimeout(context.TODO(), pollInterval, pollTimeout, true, func(ctx context.Context) (done bool, err error) {
 		clusterObj := &clusterv1alpha1.Cluster{}
 		if err := c.Get(ctx, client.ObjectKey{Name: clusterName}, clusterObj); err != nil {
-			if apierrors.IsConflict(err) {
-				return false, nil
-			}
 			return false, err
 		}
 		// set the APIEndpoint of matched cluster to a wrong value
@@ -552,9 +549,6 @@ func taintCluster(c client.Client, clusterName string, taint corev1.Taint) error
 	err := wait.PollUntilContextTimeout(context.TODO(), pollInterval, pollTimeout, true, func(ctx context.Context) (done bool, err error) {
 		clusterObj := &clusterv1alpha1.Cluster{}
 		if err := c.Get(ctx, client.ObjectKey{Name: clusterName}, clusterObj); err != nil {
-			if apierrors.IsConflict(err) {
-				return false, nil
-			}
 			return false, err
 		}
 		clusterObj.Spec.Taints = append(clusterObj.Spec.Taints, taint)
@@ -574,9 +568,6 @@ func recoverTaintedCluster(c client.Client, clusterName string, taint corev1.Tai
 	err := wait.PollUntilContextTimeout(context.TODO(), pollInterval, pollTimeout, true, func(ctx context.Context) (done bool, err error) {
 		clusterObj := &clusterv1alpha1.Cluster{}
 		if err := c.Get(ctx, client.ObjectKey{Name: clusterName}, clusterObj); err != nil {
-			if apierrors.IsConflict(err) {
-				return false, nil
-			}
 			return false, err
 		}
 		clusterObj.Spec.Taints = helper.SetCurrentClusterTaints(nil, []*corev1.Taint{&taint}, clusterObj)

diff --git a/test/e2e/framework/cluster.go b/test/e2e/framework/cluster.go
@@ -224,9 +224,6 @@ func setClusterLabel(c client.Client, clusterName string) error {
 	err := wait.PollUntilContextTimeout(context.TODO(), 2*time.Second, 10*time.Second, true, func(ctx context.Context) (done bool, err error) {
 		clusterObj := &clusterv1alpha1.Cluster{}
 		if err := c.Get(ctx, client.ObjectKey{Name: clusterName}, clusterObj); err != nil {
-			if apierrors.IsConflict(err) {
-				return false, nil
-			}
 			return false, err
 		}
 		if clusterObj.Labels == nil {
@@ -337,9 +334,6 @@ func SetClusterRegion(c client.Client, clusterName string, regionName string) er
 	return wait.PollUntilContextTimeout(context.TODO(), 2*time.Second, 10*time.Second, true, func(ctx context.Context) (done bool, err error) {
 		clusterObj := &clusterv1alpha1.Cluster{}
 		if err := c.Get(ctx, client.ObjectKey{Name: clusterName}, clusterObj); err != nil {
-			if apierrors.IsConflict(err) {
-				return false, nil
-			}
 			return false, err
 		}
 

diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -264,9 +264,6 @@ func deleteClusterLabel(c client.Client, clusterName string) error {
 	err := wait.PollUntilContextTimeout(context.TODO(), 2*time.Second, 10*time.Second, true, func(ctx context.Context) (done bool, err error) {
 		clusterObj := &clusterv1alpha1.Cluster{}
 		if err := c.Get(ctx, client.ObjectKey{Name: clusterName}, clusterObj); err != nil {
-			if apierrors.IsConflict(err) {
-				return false, nil
-			}
 			return false, err
 		}
 		delete(clusterObj.Labels, "location")