test: Ensure ingester is active in ring before tests (#10528)

Fix flake in TestIngester_PrepareInstanceRingDownscaleHandler when tests were run before an ingester had actually joined the ring. Signed-off-by: Nick Pillitteri <[email protected]>
grafana · Jan 28, 2025 · 0aeb211 · 0aeb211
1 parent c6ad9c8
commit 0aeb211
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/ingester/downscale_test.go b/pkg/ingester/downscale_test.go
@@ -39,10 +39,11 @@ func TestIngester_PrepareInstanceRingDownscaleHandler(t *testing.T) {
 				require.NoError(t, services.StopAndAwaitTerminated(context.Background(), i))
 			})
 
-			// Wait until it's healthy
-			test.Poll(t, 5*time.Second, 1, func() interface{} {
-				return i.lifecycler.HealthyInstancesCount()
-			})
+			ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+			defer cancel()
+
+			// Tests require that we've joined the ring so ensure that here.
+			require.NoError(t, ring.WaitInstanceState(ctx, ingestersRing, cfg.IngesterRing.InstanceID, ring.ACTIVE))
 		}
 
 		return i, ingestersRing