From 2f016f664df24ee276146d45ff8ece2db4e3e92e Mon Sep 17 00:00:00 2001 From: duanmeng Date: Wed, 4 May 2022 21:23:08 +0800 Subject: [PATCH] fix e2e test failed Signed-off-by: duanmeng --- test/e2e/aggregatedapi_test.go | 3 --- test/e2e/porting_workloads_test.go | 5 ----- test/e2e/suite_test.go | 2 ++ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test/e2e/aggregatedapi_test.go b/test/e2e/aggregatedapi_test.go index 5ab50c53b..20376cfad 100644 --- a/test/e2e/aggregatedapi_test.go +++ b/test/e2e/aggregatedapi_test.go @@ -88,9 +88,6 @@ var _ = ginkgo.Describe("Aggregated Kubernetes API Endpoint testing", func() { }) ginkgo.BeforeEach(func() { - // Wait for namespace present before creating resources in it. - framework.WaitNamespacePresentOnCluster(member1, tomServiceAccount.Namespace) - klog.Infof("Create ServiceAccount(%s) in the cluster(%s)", klog.KObj(tomServiceAccount).String(), member1) framework.CreateServiceAccount(clusterClient, tomServiceAccount) ginkgo.DeferCleanup(func() { diff --git a/test/e2e/porting_workloads_test.go b/test/e2e/porting_workloads_test.go index a189c29a8..758c7501b 100644 --- a/test/e2e/porting_workloads_test.go +++ b/test/e2e/porting_workloads_test.go @@ -52,11 +52,6 @@ var _ = ginkgo.Describe("porting workloads testing", func() { "Creating deployment(%s/%s) on the member cluster %s first to simulate a scenario where the target cluster already has a deployment with the same name", deploymentNamespace, deploymentName, member1, ) - gomega.Eventually(func() bool { - klog.Infof("Waiting for namespace(%s) to exist on cluster %s", testNamespace, member1) - _, err := member1Client.CoreV1().Namespaces().Get(context.TODO(), testNamespace, metav1.GetOptions{}) - return err == nil - }, pollTimeout, pollInterval).Should(gomega.Equal(true)) framework.CreateDeployment(member1Client, deployment) framework.CreatePropagationPolicy(karmadaClient, policy) diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go index 2d257ba9c..28cdb9a1c 100644 --- a/test/e2e/suite_test.go +++ b/test/e2e/suite_test.go @@ -108,6 +108,8 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { testNamespace = fmt.Sprintf("karmadatest-%s", rand.String(RandomStrLength)) err = setupTestNamespace(testNamespace, kubeClient) gomega.Expect(err).ShouldNot(gomega.HaveOccurred()) + + framework.WaitNamespacePresentOnClusters(framework.ClusterNames(), testNamespace) }) var _ = ginkgo.SynchronizedAfterSuite(func() {