Merge pull request cockroachdb#10564 from petermattis/pmattis/deflake…

…-test-store-range-upreplicate

storage: deflake TestStoreRangeUpReplicate

pkg/storage/client_raft_test.go

@@ -954,6 +954,9 @@ func TestStoreRangeUpReplicate(t *testing.T) {
 			if r == nil {
 				return errors.Errorf("expected replica for keys \"a\" - \"b\"")
 			}
+			if n := s.ReservationCount(); n != 0 {
+				return errors.Errorf("expected 0 reservations, but found %d", n)
+			}
 		}
 		return nil
 	})
@@ -966,9 +969,6 @@ func TestStoreRangeUpReplicate(t *testing.T) {
 		generated += m.RangeSnapshotsGenerated.Count()
 		normalApplied += m.RangeSnapshotsNormalApplied.Count()
 		preemptiveApplied += m.RangeSnapshotsPreemptiveApplied.Count()
-		if n := s.ReservationCount(); n != 0 {
-			t.Fatalf("expected 0 reservations, but found %d", n)
-		}
 	}
 	if generated == 0 {
 		t.Fatalf("expected at least 1 snapshot, but found 0")