Merge #94882

94882: kv/multitenant: skip TestExplainMVCCSteps, TestTransientClusterMultitenant, TestDockerCLI/test_sql_mem_monitor r=erikgrinaker a=msbutler Informs #94862 #94881 #94887 Release Note: none Epic: none Co-authored-by: Michael Butler <[email protected]> Co-authored-by: Steven Danna <[email protected]>
cockroachdb · Jan 7, 2023 · d8d16e2 · d8d16e2
2 parents 4e1d2f5 + ace7251
commit d8d16e2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/pkg/cli/democluster/demo_cluster_test.go b/pkg/cli/democluster/demo_cluster_test.go
@@ -260,6 +260,7 @@ func TestTransientClusterMultitenant(t *testing.T) {
 	// This test is too slow to complete under the race detector, sometimes.
 	skip.UnderRace(t)
 	skip.UnderStress(t)
+	skip.WithIssue(t, 94862)
 
 	demoCtx := newDemoCtx()
 	// Set up an empty 3-node cluster with tenants on each node.

diff --git a/...nteractive_tests/test_sql_mem_monitor.tcl → ...e_tests/test_sql_mem_monitor.tcl.disabled b/...nteractive_tests/test_sql_mem_monitor.tcl → ...e_tests/test_sql_mem_monitor.tcl.disabled
diff --git a/pkg/sql/explain_test.go b/pkg/sql/explain_test.go
@@ -332,7 +332,7 @@ func TestExplainMVCCSteps(t *testing.T) {
 	skip.UnderMetamorphic(t,
 		"this test expects a precise number of scan requests, which is not upheld "+
 			"in the metamorphic configuration that edits the kv batch size.")
-
+	skip.WithIssue(t, 94881)
 	ctx := context.Background()
 	srv, godb, _ := serverutils.StartServer(t, base.TestServerArgs{Insecure: true})
 	defer srv.Stopper().Stop(ctx)