Merge #110858

110858: kvserver: unskip TestMergeQueueWithSlowNonVoterSnaps r=miraradeva a=miraradeva The issue causing TestMergeQueueWithSlowNonVoterSnaps to flake was fixed in #106793. Part of: #85372 Release note: None Co-authored-by: Mira Radeva <[email protected]>
cockroachdb · Sep 20, 2023 · 1da2874 · 1da2874
2 parents d2cf1f8 + 947172c
commit 1da2874
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go
@@ -4792,7 +4792,6 @@ func TestMergeQueueSeesNonVoters(t *testing.T) {
 func TestMergeQueueWithSlowNonVoterSnaps(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	skip.WithIssue(t, 85372)
 
 	skip.UnderShort(t, "this test sleeps for a few seconds")