Skip to content

Commit 1f00e6b

Browse files
authored
Fix flaky ut (openkruise#1556)
* update meeting time and links for community call Signed-off-by: 守辰 <[email protected]> * update meeting time and links for community call Signed-off-by: 守辰 <[email protected]> * fix flaky unit test Signed-off-by: 守辰 <[email protected]> --------- Signed-off-by: 守辰 <[email protected]>
1 parent 9e01c36 commit 1f00e6b

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

pkg/controller/uniteddeployment/revision_test.go

+10-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
corev1 "k8s.io/api/core/v1"
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28+
utilretry "k8s.io/client-go/util/retry"
2829
"sigs.k8s.io/controller-runtime/pkg/client"
2930

3031
appsv1alpha1 "github.com/openkruise/kruise/apis/apps/v1alpha1"
@@ -112,9 +113,15 @@ func TestRevisionManage(t *testing.T) {
112113
g.Expect(c.List(context.TODO(), revisionList, &client.ListOptions{})).Should(gomega.BeNil())
113114
g.Expect(len(revisionList.Items)).Should(gomega.BeEquivalentTo(1))
114115

115-
g.Expect(c.Get(context.TODO(), client.ObjectKey{Namespace: instance.Namespace, Name: instance.Name}, instance)).Should(gomega.BeNil())
116-
instance.Spec.Template.StatefulSetTemplate.Labels["version"] = "v2"
117-
g.Expect(c.Update(context.TODO(), instance)).Should(gomega.BeNil())
116+
err = utilretry.RetryOnConflict(utilretry.DefaultRetry, func() error {
117+
if err := c.Get(context.TODO(), client.ObjectKey{Namespace: instance.Namespace, Name: instance.Name}, instance); err != nil {
118+
return err
119+
}
120+
instance.Spec.Template.StatefulSetTemplate.Labels["version"] = "v2"
121+
return c.Update(context.TODO(), instance)
122+
})
123+
124+
g.Expect(err).Should(gomega.BeNil())
118125
waitReconcilerProcessFinished(g, requests, 0)
119126

120127
revisionList = &appsv1.ControllerRevisionList{}

0 commit comments

Comments
 (0)