From b4ebdac5bb375f856a0f28f04459e92840c5f1f5 Mon Sep 17 00:00:00 2001 From: Yue Wang <seiwy2010@gmail.com> Date: Mon, 2 Aug 2021 10:29:31 +0800 Subject: [PATCH] quick fix tests (#1999) Signed-off-by: Yue Wang <seiwy2010@gmail.com> --- .../core.oam.dev/v1alpha2/appdeployment/suite_test.go | 2 +- test/e2e-test/rollout_plan_test.go | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/controller/core.oam.dev/v1alpha2/appdeployment/suite_test.go b/pkg/controller/core.oam.dev/v1alpha2/appdeployment/suite_test.go index 36a38251..ff4100a0 100644 --- a/pkg/controller/core.oam.dev/v1alpha2/appdeployment/suite_test.go +++ b/pkg/controller/core.oam.dev/v1alpha2/appdeployment/suite_test.go @@ -97,7 +97,7 @@ var _ = BeforeSuite(func(done Done) { // setup the controller manager since we need the component handler to run in the background ctlManager, err = ctrl.NewManager(cfg, ctrl.Options{ Scheme: common.Scheme, - MetricsBindAddress: ":8080", + MetricsBindAddress: ":8081", LeaderElection: false, LeaderElectionNamespace: "default", LeaderElectionID: "test", diff --git a/test/e2e-test/rollout_plan_test.go b/test/e2e-test/rollout_plan_test.go index b62f8a13..10f30fdd 100644 --- a/test/e2e-test/rollout_plan_test.go +++ b/test/e2e-test/rollout_plan_test.go @@ -117,6 +117,7 @@ var _ = Describe("Cloneset based rollout tests", func() { By("Get Application latest status") Eventually( func() *oamcomm.Revision { + app = v1beta1.Application{} k8sClient.Get(ctx, client.ObjectKey{Namespace: namespaceName, Name: newApp.Name}, &app) if app.Status.LatestRevision != nil { return app.Status.LatestRevision @@ -133,7 +134,8 @@ var _ = Describe("Cloneset based rollout tests", func() { Eventually( func() error { - err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespaceName, Name: app.Name}, &app) + app = v1beta1.Application{} + err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespaceName, Name: targetApp.Name}, &app) if err != nil { return err } @@ -213,6 +215,7 @@ var _ = Describe("Cloneset based rollout tests", func() { Eventually( func() error { var clonesetOwner *metav1.OwnerReference + kc = kruise.CloneSet{} err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespaceName, Name: clonesetName}, &kc) if err != nil { return err -- GitLab