Skip to content

Commit 4619e31

Browse files
jgwestjgwest
committed
chore: update deprecated functions for linter
Signed-off-by: Jonathan West <jonwest@redhat.com>
1 parent 6a1c561 commit 4619e31

File tree

3 files changed

+20
-29
lines changed

3 files changed

+20
-29
lines changed

‎controllers/argorollouts_controller_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
5656

5757
res, err := r.Reconcile(ctx, req)
5858
Expect(err).ToNot(HaveOccurred())
59-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
59+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
6060

6161
By("Check if RolloutManager's Status.Conditions are set.")
6262
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -102,7 +102,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
102102

103103
res, err := r.Reconcile(ctx, req)
104104
Expect(err).ToNot(HaveOccurred())
105-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
105+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
106106

107107
By("Check if RolloutManager's Status.Conditions are set.")
108108
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -129,7 +129,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
129129

130130
res, err := r.Reconcile(ctx, req)
131131
Expect(err).ToNot(HaveOccurred())
132-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
132+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
133133

134134
By("1st RM: Check if RolloutManager's Status.Conditions are set.")
135135
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -153,7 +153,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
153153

154154
res2, err := r2.Reconcile(ctx, req2)
155155
Expect(err).ToNot(HaveOccurred())
156-
Expect(res2.Requeue).Should(BeFalse(), "reconcile should not requeue request")
156+
Expect(res2.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
157157

158158
By("2nd RM: Check if RolloutManager's Status.Conditions are set.")
159159
Expect(r2.Client.Get(ctx, types.NamespacedName{Name: rm2.Name, Namespace: rm2.Namespace}, rm2)).To(Succeed())
@@ -196,7 +196,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
196196

197197
res, err := r.Reconcile(ctx, req)
198198
Expect(err).ToNot(HaveOccurred())
199-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
199+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
200200

201201
By("1st RM: Check if RolloutManager's Status.Conditions are set.")
202202
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -225,7 +225,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
225225

226226
res2, err := r.Reconcile(ctx, req2)
227227
Expect(err).ToNot(HaveOccurred())
228-
Expect(res2.Requeue).Should(BeFalse(), "reconcile should not requeue request")
228+
Expect(res2.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
229229

230230
By("2nd RM: Check if RolloutManager's Status.Conditions are set.")
231231
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm2.Name, Namespace: rm2.Namespace}, rm2)).To(Succeed())
@@ -237,7 +237,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
237237
By("1st RM: Reconcile 1st RolloutManager's once again and check it is also failed.")
238238
res, err = r.Reconcile(ctx, req)
239239
Expect(err).ToNot(HaveOccurred())
240-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
240+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
241241

242242
By("1st RM: Check if RolloutManager's Status.Conditions are set.")
243243
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -253,7 +253,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
253253
By("2nd RM: Reconcile 2nd RolloutManager's once again and check whether it has removed failed condition.")
254254
res2, err = r.Reconcile(ctx, req2)
255255
Expect(err).ToNot(HaveOccurred())
256-
Expect(res2.Requeue).Should(BeFalse(), "reconcile should not requeue request")
256+
Expect(res2.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
257257

258258
By("2nd RM: Check if RolloutManager's Status.Conditions are set.")
259259
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm2.Name, Namespace: rm2.Namespace}, rm2)).To(Succeed())
@@ -285,7 +285,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
285285

286286
res, err := r.Reconcile(ctx, req)
287287
Expect(err).ToNot(HaveOccurred())
288-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
288+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
289289

290290
By("Check if RolloutManager's Status.Conditions are set.")
291291
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -329,7 +329,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
329329

330330
res, err := r.Reconcile(ctx, req)
331331
Expect(err).ToNot(HaveOccurred())
332-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
332+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
333333

334334
By("Check if RolloutManager's Status.Conditions are set.")
335335
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -355,7 +355,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
355355

356356
res, err := r.Reconcile(ctx, req)
357357
Expect(err).ToNot(HaveOccurred())
358-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
358+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
359359

360360
By("1st RM: Check if RolloutManager's Status.Conditions are set.")
361361
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -384,7 +384,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
384384

385385
res2, err := r2.Reconcile(ctx, req2)
386386
Expect(err).ToNot(HaveOccurred())
387-
Expect(res2.Requeue).Should(BeFalse(), "reconcile should not requeue request")
387+
Expect(res2.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
388388

389389
By("2nd RM: Check if RolloutManager's Status.Conditions are set.")
390390
Expect(r2.Client.Get(ctx, types.NamespacedName{Name: rm2.Name, Namespace: rm2.Namespace}, rm2)).To(Succeed())
@@ -431,7 +431,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
431431

432432
res, err := r.Reconcile(ctx, req)
433433
Expect(err).ToNot(HaveOccurred())
434-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
434+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
435435

436436
By("1st RM: Check if RolloutManager's Status.Conditions are set.")
437437
Expect(r.Client.Get(ctx, types.NamespacedName{Name: rm.Name, Namespace: rm.Namespace}, rm)).To(Succeed())
@@ -464,7 +464,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
464464

465465
res2, err := r2.Reconcile(ctx, req2)
466466
Expect(err).ToNot(HaveOccurred())
467-
Expect(res2.Requeue).Should(BeFalse(), "reconcile should not requeue request")
467+
Expect(res2.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
468468

469469
By("2nd RM: Check if RolloutManager's Status.Conditions are set.")
470470
Expect(r2.Client.Get(ctx, types.NamespacedName{Name: rm2.Name, Namespace: rm2.Namespace}, rm2)).To(Succeed())
@@ -510,7 +510,7 @@ var _ = Describe("RolloutManagerReconciler tests", func() {
510510

511511
res, err := r.Reconcile(ctx, req)
512512
Expect(err).ToNot(HaveOccurred())
513-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
513+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
514514

515515
Expect(r.Client.Get(ctx, client.ObjectKeyFromObject(clusterRoleBinding), clusterRoleBinding)).ToNot(Succeed(), "should have been deleted by Reconcile call")
516516
Expect(r.Client.Get(ctx, client.ObjectKeyFromObject(clusterRole), clusterRole)).ToNot(Succeed(), "should have been deleted by Reconcile call")

‎controllers/resources_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ var _ = Describe("Resource creation and cleanup tests", func() {
899899

900900
res, err := r.Reconcile(ctx, req)
901901
Expect(err).NotTo(HaveOccurred())
902-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
902+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
903903

904904
err = r.Client.Delete(ctx, a)
905905
Expect(err).ToNot(HaveOccurred())
@@ -949,7 +949,7 @@ var _ = Describe("Resource creation and cleanup tests", func() {
949949

950950
res, err := r.Reconcile(ctx, req)
951951
Expect(err).ToNot(HaveOccurred())
952-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
952+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
953953

954954
expectedServiceMonitor := serviceMonitor()
955955

@@ -1004,7 +1004,7 @@ var _ = Describe("Resource creation and cleanup tests", func() {
10041004

10051005
res, err := r.Reconcile(ctx, req)
10061006
Expect(err).ToNot(HaveOccurred())
1007-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
1007+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
10081008

10091009
expectedSM := serviceMonitor()
10101010

@@ -1030,7 +1030,7 @@ var _ = Describe("Resource creation and cleanup tests", func() {
10301030
It("Verify ServiceMonitor is not created if the CRD does not exist.", func() {
10311031
res, err := r.Reconcile(ctx, req)
10321032
Expect(err).ToNot(HaveOccurred())
1033-
Expect(res.Requeue).Should(BeFalse(), "reconcile should not requeue request")
1033+
Expect(res.RequeueAfter).Should(BeZero(), "reconcile should not requeue request")
10341034

10351035
sm := &monitoringv1.ServiceMonitor{}
10361036
Expect(r.Client.Get(ctx, types.NamespacedName{

‎hack/verify-rollouts-e2e-tests/main.go‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,6 @@ func main() {
1212

1313
// As of March 2024 (Rollouts v1.6.6):
1414
//
15-
// Always fail:
16-
// - TestAPISIXCanarySetHeaderStep
17-
// - TestExperimentWithDryRunMetrics (also fails when running upstream rollouts as a container)
18-
// - TestControllerMetrics (also fails when running upstream rollouts as a container)
19-
//
20-
// Often fail:
21-
// - TestBlueGreenPromoteFull
22-
//
2315
// Intermittently fail:
2416
// - TestCanaryDynamicStableScale
2517
// - TestCanaryScaleDownOnAbort
@@ -36,10 +28,9 @@ func main() {
3628
"TestExperimentSuite/TestExperimentWithDryRunMetrics",
3729
"TestFunctionalSuite/TestControllerMetrics",
3830
"TestFunctionalSuite/TestBlueGreenPromoteFull",
31+
"TestAnalysisSuite/TestCanaryInconclusiveBackgroundAnalysis",
3932
}
4033

41-
// DONE 6 runs, 144 tests, 6 skipped, 47 failures in 2279.668s
42-
4334
// 1) Read E2E test log, output by run-upstream-argo-rollouts-e2e-tests.sh
4435
if len(os.Args) != 2 {
4536
reportErrorAndExit(fmt.Errorf("expected args: path to E2E test log"))

0 commit comments

Comments
 (0)
⚡