Merge cockroachdb#105175

105175: sql: skip TestQueryCache r=herkolategan a=knz Informs cockroachdb#105174. Informs cockroachdb#104660. Informs cockroachdb#105100. Co-authored-by: Raphael 'kena' Poss <[email protected]>
zachlite · Jun 20, 2023 · 0fef4be · 0fef4be
2 parents a416398 + d22a964
commit 0fef4be
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/sql/plan_opt_test.go b/pkg/sql/plan_opt_test.go
@@ -25,6 +25,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/parser"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -112,6 +113,8 @@ func TestQueryCache(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.WithIssue(t, 105174, "flaky test")
+
 	// Grouping the parallel subtests into a non-parallel subtest allows the defer
 	// call above to work as expected.
 	t.Run("group", func(t *testing.T) {