Merge #37229

37229: storage: skip TestRangeMergeSlowWatcher r=nvanbenschoten a=tbg See #37191 Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
cockroachdb · May 1, 2019 · 5c1497a · 5c1497a
2 parents 24feca7 + d8120b2
commit 5c1497a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pkg/storage/client_merge_test.go b/pkg/storage/client_merge_test.go
@@ -2848,6 +2848,8 @@ func testMergeWatcher(t *testing.T, injectFailures bool) {
 func TestStoreRangeMergeSlowWatcher(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 
+	t.Skip("https://github.com/cockroachdb/cockroach/issues/37191")
+
 	ctx := context.Background()
 	aKey, bKey, cKey := roachpb.RKey("a"), roachpb.RKey("b"), roachpb.RKey("c")
 	storeCfg := storage.TestStoreConfig(nil)