karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix flaking test: search proxy get node report not found 

Signed-off-by: changzhen <changzhen5@huawei.com>
This commit is contained in:
changzhen 2022-09-09 18:06:31 +08:00
parent fdb13bedaa
commit 4fd36b55c5
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/aggregatedapi_test.go
View File

@ -119,9 +119,9 @@ var _ = ginkgo.Describe("Aggregated Kubernetes API Endpoint testing", func() {
ginkgo.It("tom access the member cluster", func() {
ginkgo.By("access the cluster `/api` path with right", func() {
gomega.Eventually(func() (int, error) {
gomega.Eventually(func(g gomega.Gomega) (int, error) {
code, err := helper.DoRequest(fmt.Sprintf(karmadaHost+clusterProxy+"api", member1), tomToken)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
g.Expect(err).ShouldNot(gomega.HaveOccurred())
return code, nil
}, pollTimeout, pollInterval).Should(gomega.Equal(http.StatusOK))
})
@ -138,9 +138,9 @@ var _ = ginkgo.Describe("Aggregated Kubernetes API Endpoint testing", func() {
})
ginkgo.By("access the member1 /api/v1/nodes path with right", func() {
gomega.Eventually(func() (int, error) {
gomega.Eventually(func(g gomega.Gomega) (int, error) {
code, err := helper.DoRequest(fmt.Sprintf(karmadaHost+clusterProxy+"api/v1/nodes", member1), tomToken)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
g.Expect(err).ShouldNot(gomega.HaveOccurred())
return code, nil
}, pollTimeout, pollInterval).Should(gomega.Equal(http.StatusOK))
})

8
test/e2e/framework/workload.go
View File

@ -81,15 +81,15 @@ func WaitWorkloadPresentOnClusterFitWith(cluster, namespace, name string, fit fu
gomega.Expect(clusterClient).ShouldNot(gomega.BeNil())
klog.Infof("Waiting for Workload(%s/%s) synced on cluster(%s)", namespace, name, cluster)
gomega.Eventually(func() bool {
gomega.Eventually(func(g gomega.Gomega) (bool, error) {
workload, err := clusterClient.Resource(workloadGVR).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
return false
return false, nil
}
typedObj := &workloadv1alpha1.Workload{}
err = runtime.DefaultUnstructuredConverter.FromUnstructured(workload.UnstructuredContent(), typedObj)
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
return fit(typedObj)
g.Expect(err).ShouldNot(gomega.HaveOccurred())
return fit(typedObj), nil
}, pollTimeout, pollInterval).Should(gomega.Equal(true))
}

12
test/e2e/search_test.go
View File

@ -54,12 +54,12 @@ var _ = ginkgo.Describe("[karmada-search] karmada search testing", ginkgo.Ordere
// var pollTimeout = 30 * time.Second
var searchObject = func(path, target string, exists bool) {
gomega.Eventually(func() bool {
gomega.Eventually(func(g gomega.Gomega) (bool, error) {
res := karmadaClient.SearchV1alpha1().RESTClient().Get().AbsPath(path).Do(context.TODO())
gomega.Expect(res.Error()).ShouldNot(gomega.HaveOccurred())
g.Expect(res.Error()).ShouldNot(gomega.HaveOccurred())
raw, err := res.Raw()
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
return strings.Contains(string(raw), target)
g.Expect(err).ShouldNot(gomega.HaveOccurred())
return strings.Contains(string(raw), target), nil
}, pollTimeout, pollInterval).Should(gomega.Equal(exists))
}
@ -557,7 +557,7 @@ var _ = ginkgo.Describe("[karmada-search] karmada search testing", ginkgo.Ordere
gomega.Eventually(func(g gomega.Gomega) {
var err error
get, err = proxyClient.CoreV1().Nodes().Get(context.TODO(), testObject.GetName(), metav1.GetOptions{})
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
g.Expect(err).ShouldNot(gomega.HaveOccurred())
}, pollTimeout, pollInterval).Should(gomega.Succeed())
gomega.Expect(get.Annotations[clusterv1alpha1.CacheSourceAnnotationKey]).Should(gomega.Equal(member1))
@ -574,7 +574,7 @@ var _ = ginkgo.Describe("[karmada-search] karmada search testing", ginkgo.Ordere
gomega.Eventually(func(g gomega.Gomega) {
var err error
proxyList, err = proxyClient.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())
g.Expect(err).ShouldNot(gomega.HaveOccurred())
fromProxy := sets.NewString()
for _, item := range proxyList.Items {