From b3324c4c2cab7f5239096272cf2337cb6c4a9529 Mon Sep 17 00:00:00 2001 From: lizhencheng <140870529+LiZhenCheng9527@users.noreply.github.com> Date: Fri, 23 Feb 2024 09:43:11 +0800 Subject: [PATCH] rename e2e function name WaitXXXFitWith to WaitXXXReady (#607) Signed-off-by: LiZhenCheng9527 --- e2e/fleet_attachedcluster_test.go | 2 +- e2e/resources/attachedcluster.go | 2 +- e2e/resources/fleet.go | 2 +- e2e/suite_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/fleet_attachedcluster_test.go b/e2e/fleet_attachedcluster_test.go index 07753cc0..caaa9d26 100644 --- a/e2e/fleet_attachedcluster_test.go +++ b/e2e/fleet_attachedcluster_test.go @@ -70,7 +70,7 @@ var _ = ginkgo.Describe("[AttachedClusters] AttachedClusters testing", func() { // create fleet and checkout fleet status fleetCreateErr := resources.CreateFleet(kuratorClient, fleet) gomega.Expect(fleetCreateErr).ShouldNot(gomega.HaveOccurred()) - resources.WaitFleetFitWith(kuratorClient, fleetNamespace, fleetname, func(fleet *fleetv1a1.Fleet) bool { + resources.WaitFleetReady(kuratorClient, fleetNamespace, fleetname, func(fleet *fleetv1a1.Fleet) bool { return fleet.Status.Phase == fleetv1a1.ReadyPhase }) }) diff --git a/e2e/resources/attachedcluster.go b/e2e/resources/attachedcluster.go index 3a02eeda..6ed6b4da 100644 --- a/e2e/resources/attachedcluster.go +++ b/e2e/resources/attachedcluster.go @@ -84,7 +84,7 @@ func RemoveAttachedCluster(client kurator.Interface, namespace, name string) err } // WaitAttachedClusterFitWith wait attachedCluster sync with fit func. -func WaitAttachedClusterFitWith(client kurator.Interface, namespace, name string, fit func(attachedCluster *clusterv1a1.AttachedCluster) bool) { +func WaitAttachedClusterReady(client kurator.Interface, namespace, name string, fit func(attachedCluster *clusterv1a1.AttachedCluster) bool) { gomega.Eventually(func() bool { attachedClusterPresentOnCluster, err := client.ClusterV1alpha1().AttachedClusters(namespace).Get(context.TODO(), name, metav1.GetOptions{}) if err != nil { diff --git a/e2e/resources/fleet.go b/e2e/resources/fleet.go index 85cbbee2..8ff342d7 100644 --- a/e2e/resources/fleet.go +++ b/e2e/resources/fleet.go @@ -80,7 +80,7 @@ func RemoveFleet(client kurator.Interface, namespace, name string) error { } // WaitAttachedClusterFitWith wait fleet sync with fit func. -func WaitFleetFitWith(client kurator.Interface, namespace, name string, fit func(fleeet *fleetv1a1.Fleet) bool) { +func WaitFleetReady(client kurator.Interface, namespace, name string, fit func(fleeet *fleetv1a1.Fleet) bool) { gomega.Eventually(func() bool { fleetPresentOnCluster, err := client.FleetV1alpha1().Fleets(namespace).Get(context.TODO(), name, metav1.GetOptions{}) if err != nil { diff --git a/e2e/suite_test.go b/e2e/suite_test.go index aa2e73e6..c8b284f9 100644 --- a/e2e/suite_test.go +++ b/e2e/suite_test.go @@ -99,7 +99,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { attachedCreateErr := resources.CreateAttachedCluster(kuratorClient, attachedcluster) gomega.Expect(attachedCreateErr).ShouldNot(gomega.HaveOccurred()) - resources.WaitAttachedClusterFitWith(kuratorClient, namespace, memberClusterName, func(attachedCluster *clusterv1a1.AttachedCluster) bool { + resources.WaitAttachedClusterReady(kuratorClient, namespace, memberClusterName, func(attachedCluster *clusterv1a1.AttachedCluster) bool { return attachedCluster.Status.Ready }) })