From 0ae82d803469ae8b7d307facca48a6688c668477 Mon Sep 17 00:00:00 2001 From: Somefive Date: Mon, 13 Mar 2023 16:53:00 +0800 Subject: [PATCH] Fix: mc flaky e2e test (#5661) * Fix: mc flaky e2e test Signed-off-by: Somefive * Fix: add time for workflow rollback Signed-off-by: Somefive * Fix: load-test flaky Signed-off-by: Somefive --------- Signed-off-by: Somefive --- pkg/utils/load_test.go | 16 +++++++--------- .../multicluster_standalone_test.go | 6 ++++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkg/utils/load_test.go b/pkg/utils/load_test.go index 51e23f89d..a9ad4b2a7 100644 --- a/pkg/utils/load_test.go +++ b/pkg/utils/load_test.go @@ -19,6 +19,7 @@ package utils import ( "fmt" "net/http" + "net/http/httptest" "os" "testing" "time" @@ -27,18 +28,15 @@ import ( ) func TestReadRemoteOrLocalPath(t *testing.T) { - go func() { - svr := http.NewServeMux() - svr.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintf(w, `{"Outputs":{"Chinese":"输出"}}`) - }) - http.ListenAndServe(":65503", svr) - }() + svr := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + _, _ = fmt.Fprintf(w, `{"Outputs":{"Chinese":"输出"}}`) + })) + defer func() { svr.Close() }() time.Sleep(time.Millisecond) - _, err := ReadRemoteOrLocalPath("http://127.0.0.1:65503", false) + _, err := ReadRemoteOrLocalPath(svr.URL, false) assert.NoError(t, err) - _, err = ReadRemoteOrLocalPath("http://127.0.0.1:65503", true) + _, err = ReadRemoteOrLocalPath(svr.URL, true) assert.NoError(t, err) _, err = ReadRemoteOrLocalPath("vela.json", false) assert.NoError(t, err) diff --git a/test/e2e-multicluster-test/multicluster_standalone_test.go b/test/e2e-multicluster-test/multicluster_standalone_test.go index 73eb7c849..0d3f31e5e 100644 --- a/test/e2e-multicluster-test/multicluster_standalone_test.go +++ b/test/e2e-multicluster-test/multicluster_standalone_test.go @@ -65,7 +65,9 @@ var _ = Describe("Test multicluster standalone scenario", func() { applyFile := func(filename string) { un := readFile(filename) - Expect(k8sClient.Create(context.Background(), un)).Should(Succeed()) + Eventually(func(g Gomega) { + g.Expect(k8sClient.Create(context.Background(), un)).Should(Succeed()) + }).WithTimeout(10 * time.Second).WithPolling(2 * time.Second).Should(Succeed()) } BeforeEach(func() { @@ -300,7 +302,7 @@ var _ = Describe("Test multicluster standalone scenario", func() { revs, err := application.GetSortedAppRevisions(hubCtx, k8sClient, app.Name, namespace) g.Expect(err).Should(Succeed()) g.Expect(len(revs)).Should(Equal(1)) - }).WithTimeout(10 * time.Second).Should(Succeed()) + }).WithTimeout(30 * time.Second).WithPolling(2 * time.Second).Should(Succeed()) }) It("Test large application parallel apply and delete", func() {