github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-08-19 04:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rt flaky test (#1825)

Browse Source
This commit is contained in:
wyike
2021-06-22 12:13:35 +08:00
committed by GitHub
parent d2a2a9ac07
commit 4040c8e67c
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e-test/app_resourcetracker_test.go
+26 -11
View File
@@ -206,7 +206,7 @@ var _ = Describe("Test application cross namespace resource", func() {
controller := metav1.GetControllerOf(pv)
Expect(controller.Kind == v1beta1.ResourceTrackerKind).Should(BeTrue())
By("Remove the cluster-scope trait from application")
By("Remove the cluster-scope trait from application ")
app = &v1beta1.Application{
ObjectMeta: metav1.ObjectMeta{
Name: appName,
@@ -279,7 +279,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
By("check resource tracker has been created and app status ")
resourceTracker := new(v1beta1.ResourceTracker)
Eventually(func() error {
@@ -356,7 +358,7 @@ var _ = Describe("Test application cross namespace resource", func() {
}, time.Second*5, time.Millisecond*300).Should(BeNil())
})
It("Test update application by add a cross namespace trait resource", func() {
It("Test update application by add a cross namespace trait resource ", func() {
var (
appName = "test-app-2"
app = new(v1beta1.Application)
@@ -389,8 +391,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
resourceTracker := new(v1beta1.ResourceTracker)
By("application contain a normal workload, check application and workload status")
Eventually(func() error {
@@ -510,7 +513,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
resourceTracker := new(v1beta1.ResourceTracker)
By("create application will create a cross ns trait, and resourceTracker. check those status")
Eventually(func() error {
@@ -620,7 +625,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
resourceTracker := new(v1beta1.ResourceTracker)
By("create application will generate two workload, and generate resourceTracker")
@@ -743,7 +750,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
By("check resource tracker has been created and app status ")
resourceTracker := new(v1beta1.ResourceTracker)
Eventually(func() error {
@@ -905,7 +914,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
resourceTracker := new(v1beta1.ResourceTracker)
By("create application will generate two workload, and generate resourceTracker")
@@ -1058,7 +1069,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
resourceTracker := new(v1beta1.ResourceTracker)
By("create app and check resource and app status")
Eventually(func() error {
@@ -1207,7 +1220,9 @@ var _ = Describe("Test application cross namespace resource", func() {
},
},
}
Expect(k8sClient.Create(ctx, app)).Should(BeNil())
Eventually(func() error {
return k8sClient.Create(ctx, app)
}, 15*time.Second, 300*time.Microsecond).Should(SatisfyAny(Succeed(), &util.AlreadyExistMatcher{}))
By("check resource tracker has been created and app status ")
resourceTracker := new(v1beta1.ResourceTracker)
Eventually(func() error {
test/e2e-test/rollout_plan_test.go
+6 -6
View File
@@ -131,7 +131,10 @@ var _ = Describe("Cloneset based rollout tests", func() {
Eventually(
func() error {
k8sClient.Get(ctx, client.ObjectKey{Namespace: namespaceName, Name: app.Name}, &app)
err := k8sClient.Get(ctx, client.ObjectKey{Namespace: namespaceName, Name: app.Name}, &app)
if err != nil {
return err
}
app.Spec = targetApp.DeepCopy().Spec
return k8sClient.Update(ctx, app.DeepCopy())
}, time.Second*15, time.Millisecond*500).Should(Succeed())
@@ -142,12 +145,9 @@ var _ = Describe("Cloneset based rollout tests", func() {
var appRevList = &v1beta1.ApplicationRevisionList{}
_ = k8sClient.List(ctx, appRevList, client.InNamespace(namespaceName),
client.MatchingLabels(map[string]string{oam.LabelAppName: targetApp.Name}))
if appRevList != nil {
return len(appRevList.Items) >= 2
}
return false
return len(appRevList.Items) >= 2
},
time.Second*15, time.Millisecond*500).Should(BeTrue())
time.Second*30, time.Millisecond*300).Should(BeTrue())
}
createAppRolling := func(newAppRollout *v1beta1.AppRollout) {