consolidate test time constants

Signed-off-by: Wei Weng <[email protected]>

Author: Wei Weng

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
            ## Repository upload token - get it from codecov.io. Required only for private repositories
           token: ${{ secrets.CODECOV_TOKEN }}
           ## Comma-separated list of files to upload
-          files: ./it-coverage.xml;./ut-coverage.xml
+          files: ./ut-coverage.xml
 
   e2e-tests:
     strategy:

test/e2e/fleet_guard_rail_test.go

@@ -37,7 +37,6 @@ import (
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils"
 	"github.com/kubefleet-dev/kubefleet/pkg/webhook/validation"
-	testutils "github.com/kubefleet-dev/kubefleet/test/utils"
 
 	fleetnetworkingv1alpha1 "go.goms.io/fleet-networking/api/v1alpha1"
 )
@@ -720,7 +719,7 @@ var _ = Describe("fleet guard rail for UPDATE work operations, in fleet prefixed
 				return err
 			}
 			return checkIfStatusErrorWithMessage(err, fmt.Sprintf(validation.ResourceDeniedFormat, testUser, utils.GenerateGroupString(testGroups), admissionv1.Update, &workGVK, "status", types.NamespacedName{Name: w.Name, Namespace: w.Namespace}))
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 
 	It("should deny DELETE work operation for user not in MC identity", func() {

test/e2e/webhook_test.go

@@ -34,7 +34,6 @@ import (
 	clusterv1beta1 "github.com/kubefleet-dev/kubefleet/apis/cluster/v1beta1"
 	placementv1beta1 "github.com/kubefleet-dev/kubefleet/apis/placement/v1beta1"
 	"github.com/kubefleet-dev/kubefleet/pkg/utils/defaulter"
-	testutils "github.com/kubefleet-dev/kubefleet/test/utils"
 )
 
 var _ = Describe("webhook tests for CRP CREATE operations", func() {
@@ -80,7 +79,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("cluster names cannot be empty for policy type"))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("number of clusters must be nil for policy type PickFixed"))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should deny create on CRP with invalid placement policy for PickN", func() {
@@ -127,7 +126,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("unknown unsatisfiable type random-type"))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("number of cluster cannot be nil for policy type PickN"))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should deny create CRP with invalid GVK", func() {
@@ -157,7 +156,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 				g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create CRP call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp(regexp.QuoteMeta("failed to get GVR of the selector")))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should deny create CRP with namespaced resource selected", func() {
@@ -187,7 +186,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 				g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create CRP call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp(regexp.QuoteMeta("the resource is not found in schema (please retry) or it is not a cluster scoped resource")))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 	})
 
@@ -228,7 +227,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 				g.Expect(hubClient.Get(ctx, types.NamespacedName{Name: crpName}, &createdCRP)).Should(Succeed(), "Failed to get CRP %s", crpName)
 				g.Expect(createdCRP.Spec.Policy).To(Equal(&placementv1beta1.PlacementPolicy{PlacementType: placementv1beta1.PickAllPlacementType}), "CRP should have default policy type PickAll")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow create CRP with TopologySpreadConstraints & Tolerations fields and update fields with default values", func() {
@@ -289,7 +288,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 					},
 				}), "CRP should have default tolerations fields")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow create CRP with nil strategy and update fields with default values", func() {
@@ -325,7 +324,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 					},
 				}), "CRP should have default strategy type RollingUpdate with default values")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow create CRP with nil revision history limit and update fields with default values", func() {
@@ -358,7 +357,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 				g.Expect(hubClient.Get(ctx, types.NamespacedName{Name: crpName}, &createdCRP)).Should(Succeed(), "Failed to get CRP %s", crpName)
 				g.Expect(*createdCRP.Spec.RevisionHistoryLimit).To(Equal(int32(defaulter.DefaultRevisionHistoryLimitValue)), "CRP should have default revision history limit value")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow create CRP with nil serverside apply config and update fields with default values", func() {
@@ -396,7 +395,7 @@ var _ = Describe("webhook tests for CRP CREATE operations", func() {
 					ForceConflicts: false,
 				}), "CRP should have default serverside apply config")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 	})
 })
@@ -441,7 +440,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 				g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update CRP call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("the labelSelector and name fields are mutually exclusive"))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should deny update on CRP with invalid placement policy for PickAll", func() {
@@ -483,7 +482,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp(regexp.QuoteMeta(fmt.Sprintf("the labelSelector in cluster selector %+v is invalid:", crp.Spec.Policy.Affinity.ClusterAffinity.RequiredDuringSchedulingIgnoredDuringExecution.ClusterSelectorTerms[0].LabelSelector))))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("topology spread constraints needs to be empty for policy type PickAll"))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should deny update on CRP with placement policy type update", func() {
@@ -503,7 +502,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 				g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update CRP call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 				g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("placement type is immutable"))
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 	})
 
@@ -541,7 +540,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 				g.Expect(hubClient.Get(ctx, types.NamespacedName{Name: crpName}, &updatedCRP)).Should(Succeed(), "Failed to get CRP %s", crpName)
 				g.Expect(updatedCRP.Spec.Policy).To(Equal(&placementv1beta1.PlacementPolicy{PlacementType: placementv1beta1.PickAllPlacementType}), "CRP should have default policy type PickAll")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow update CRP with empty strategy and update fields with default values", func() {
@@ -568,7 +567,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 					},
 				}), "CRP should have default strategy type RollingUpdate with default values")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow update CRP with nil revision history limit and update fields with default values", func() {
@@ -582,7 +581,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 				g.Expect(hubClient.Get(ctx, types.NamespacedName{Name: crpName}, &updatedCRP)).Should(Succeed(), "Failed to get CRP %s", crpName)
 				g.Expect(*createdCRP.Spec.RevisionHistoryLimit).To(Equal(int32(defaulter.DefaultRevisionHistoryLimitValue)), "CRP should have default revision history limit value")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 
 		It("should allow update CRP with nil serverside apply config and update fields with default values", func() {
@@ -602,7 +601,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 					ForceConflicts: false,
 				}), "CRP should have default serverside apply config")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 	})
 
@@ -668,7 +667,7 @@ var _ = Describe("webhook tests for CRP UPDATE operations", Ordered, func() {
 					},
 				}), "CRP should have default tolerations fields")
 				return nil
-			}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+			}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 		})
 	})
 })
@@ -731,7 +730,7 @@ var _ = Describe("webhook tests for CRP tolerations", Ordered, func() {
 			g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update CRP call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 			g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp(fmt.Sprintf("invalid toleration %+v: %s", invalidToleration, "toleration key cannot be empty, when operator is Equal")))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 
 	It("should deny update on CRP with update to existing toleration", func() {
@@ -760,7 +759,7 @@ var _ = Describe("webhook tests for CRP tolerations", Ordered, func() {
 			g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update CRP call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 			g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("tolerations have been updated/deleted, only additions to tolerations are allowed"))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 
 	It("should allow update on CRP with adding a new toleration", func() {
@@ -775,7 +774,7 @@ var _ = Describe("webhook tests for CRP tolerations", Ordered, func() {
 			}
 			crp.Spec.Policy.Tolerations = append(crp.Spec.Policy.Tolerations, newToleration)
 			return hubClient.Update(ctx, &crp)
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 })
 
@@ -808,7 +807,7 @@ var _ = Describe("webhook tests for MC taints", Ordered, func() {
 			g.Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update MC call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 			g.Expect(statusErr.ErrStatus.Message).Should(MatchRegexp("name part must consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character"))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 })
 
@@ -1169,7 +1168,7 @@ var _ = Describe("webhook tests for CRO UPDATE operations", Ordered, func() {
 			Expect(statusErr.Status().Message).Should(MatchRegexp(fmt.Sprintf("resource selector %+v already exists, and must be unique", cro.Spec.ClusterResourceSelectors[0])))
 			Expect(statusErr.Status().Message).Should(MatchRegexp(regexp.QuoteMeta(fmt.Sprintf("resource name is required for resource selection %+v", invalidSelector1))))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 
 	It("should deny update CRO for invalid cluster resource override", func() {
@@ -1248,7 +1247,7 @@ var _ = Describe("webhook tests for CRO UPDATE operations", Ordered, func() {
 			Expect(statusErr.Status().Message).Should(MatchRegexp("cannot override typeMeta fields"))
 			Expect(statusErr.Status().Message).Should(MatchRegexp("path cannot be empty"))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 })
 
@@ -1591,7 +1590,7 @@ var _ = Describe("webhook tests for ResourceOverride UPDATE operations", Ordered
 			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Update RO call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 			Expect(statusErr.Status().Message).Should(MatchRegexp(fmt.Sprintf("resource selector %+v already exists, and must be unique", selector)))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 
 	It("should deny update RO with invalid resource override", func() {
@@ -1675,6 +1674,6 @@ var _ = Describe("webhook tests for ResourceOverride UPDATE operations", Ordered
 			Expect(statusErr.Status().Message).Should(MatchRegexp("path cannot contain empty string"))
 			Expect(statusErr.Status().Message).Should(MatchRegexp("cannot override metadata fields except annotations and labels"))
 			return nil
-		}, testutils.PollTimeout, testutils.PollInterval).Should(Succeed())
+		}, eventuallyDuration, eventuallyInterval).Should(Succeed())
 	})
 })