From 8c7db9b0e07bcab427de0f714ce4f6d2d51e2c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E5=85=83?= Date: Tue, 5 Jan 2021 19:31:11 +0800 Subject: [PATCH] larger time --- e2e/cli.go | 2 +- e2e/commonContext.go | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/e2e/cli.go b/e2e/cli.go index 27d2a624a..b3119d7f0 100644 --- a/e2e/cli.go +++ b/e2e/cli.go @@ -36,7 +36,7 @@ func Exec(cli string) (string, error) { if err != nil { return string(output), err } - s := session.Wait(30 * time.Second) + s := session.Wait(1200 * time.Second) return string(s.Out.Contents()) + string(s.Err.Contents()), nil } diff --git a/e2e/commonContext.go b/e2e/commonContext.go index c35ead628..6d13f47ea 100644 --- a/e2e/commonContext.go +++ b/e2e/commonContext.go @@ -209,20 +209,15 @@ var ( k8sclient, err := newK8sClient() gomega.Expect(err).NotTo(gomega.HaveOccurred()) - cli := fmt.Sprintf("kubectl -n %s get application %s -o yaml", envName, applicationName) - output, err := Exec(cli) - gomega.Expect(err).NotTo(gomega.HaveOccurred()) - gomega.Expect(output).To(gomega.ContainSubstring(applicationName)) - ginkgo.By("check AppConfig reconciled ready") gomega.Eventually(func() int { appConfig := &corev1alpha2.ApplicationConfiguration{} _ = k8sclient.Get(ctx.Background(), client.ObjectKey{Name: applicationName, Namespace: "default"}, appConfig) return len(appConfig.Status.Workloads) - }, 200*time.Second, 1*time.Second).ShouldNot(gomega.Equal(0)) + }, 1200*time.Second, 1*time.Second).ShouldNot(gomega.Equal(0)) - cli = fmt.Sprintf("vela status %s", applicationName) - output, err = LongTimeExec(cli, 120*time.Second) + cli := fmt.Sprintf("vela status %s", applicationName) + output, err := LongTimeExec(cli, 120*time.Second) gomega.Expect(err).NotTo(gomega.HaveOccurred()) gomega.Expect(output).To(gomega.ContainSubstring("Checking health status")) // TODO(zzxwill) need to check workloadType after app status is refined