File tree Expand file tree Collapse file tree 2 files changed +6
-0
lines changed
Expand file tree Collapse file tree 2 files changed +6
-0
lines changed Original file line number Diff line number Diff line change @@ -54,6 +54,7 @@ go_test(
5454 "//pkg/sql/sem/eval" ,
5555 "//pkg/sql/sem/tree" ,
5656 "//pkg/testutils/serverutils" ,
57+ "//pkg/testutils/skip" ,
5758 "//pkg/testutils/sqlutils" ,
5859 "//pkg/testutils/testcluster" ,
5960 "//pkg/util/leaktest" ,
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ import (
2121 "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb"
2222 "github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
2323 "github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
24+ "github.com/cockroachdb/cockroach/pkg/testutils/skip"
2425 "github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
2526 "github.com/cockroachdb/cockroach/pkg/util/leaktest"
2627 "github.com/cockroachdb/cockroach/pkg/util/log"
@@ -132,6 +133,8 @@ func TestDistributedMergeThreeNodes(t *testing.T) {
132133 defer leaktest .AfterTest (t )()
133134 defer log .Scope (t ).Close (t )
134135
136+ skip .UnderRace (t )
137+
135138 ctx := context .Background ()
136139 instanceCount := 3
137140 taskCount := 100
@@ -147,6 +150,8 @@ func TestDistributedMergeMoreInstancesThanTasks(t *testing.T) {
147150 defer leaktest .AfterTest (t )()
148151 defer log .Scope (t ).Close (t )
149152
153+ skip .UnderRace (t )
154+
150155 ctx := context .Background ()
151156 instanceCount := 5
152157 taskCount := 2 // Fewer tasks than instances
You can’t perform that action at this time.
0 commit comments