From 6c85674524fb135ced00fdbf820656e176fcd7e2 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Mon, 25 Mar 2024 15:38:59 -0500 Subject: [PATCH] Harden the tests a bit --- tests/e2e/solrcloud_rolling_upgrade_test.go | 2 +- tests/e2e/solrcloud_scaling_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/e2e/solrcloud_rolling_upgrade_test.go b/tests/e2e/solrcloud_rolling_upgrade_test.go index 6143342a..faf2175e 100644 --- a/tests/e2e/solrcloud_rolling_upgrade_test.go +++ b/tests/e2e/solrcloud_rolling_upgrade_test.go @@ -163,7 +163,7 @@ var _ = FDescribe("E2E - SolrCloud - Rolling Upgrades", func() { } By("waiting for the balanceReplicas to finish") - expectStatefulSetWithChecks(ctx, solrCloud, solrCloud.StatefulSetName(), func(g Gomega, found *appsv1.StatefulSet) { + expectStatefulSetWithChecksAndTimeout(ctx, solrCloud, solrCloud.StatefulSetName(), time.Second*30, time.Second, func(g Gomega, found *appsv1.StatefulSet) { clusterOp, err := controllers.GetCurrentClusterOp(found) g.Expect(err).ToNot(HaveOccurred(), "Error occurred while finding clusterLock for SolrCloud") g.Expect(clusterOp).To(BeNil(), "StatefulSet should not have a balanceReplicas lock after balancing is complete.") diff --git a/tests/e2e/solrcloud_scaling_test.go b/tests/e2e/solrcloud_scaling_test.go index 820f931a..f92e9855 100644 --- a/tests/e2e/solrcloud_scaling_test.go +++ b/tests/e2e/solrcloud_scaling_test.go @@ -385,7 +385,7 @@ var _ = FDescribe("E2E - SolrCloud - Scale Up", func() { }) By("waiting for the scaleUp to begin") - statefulSet = expectStatefulSetWithChecksAndTimeout(ctx, solrCloud, solrCloud.StatefulSetName(), time.Second*5, time.Millisecond*5, func(g Gomega, found *appsv1.StatefulSet) { + statefulSet = expectStatefulSetWithChecksAndTimeout(ctx, solrCloud, solrCloud.StatefulSetName(), time.Second*5, time.Millisecond, func(g Gomega, found *appsv1.StatefulSet) { clusterOp, err := controllers.GetCurrentClusterOp(found) g.Expect(err).ToNot(HaveOccurred(), "Error occurred while finding clusterLock for SolrCloud") g.Expect(clusterOp).ToNot(BeNil(), "StatefulSet does not have a scaleUp lock.")