Merge cockroachdb#58156 cockroachdb#58166

58156: logictest: fix upsert test r=RaduBerinde a=yuzefovich The trace message appears to contain only a single line if an error occurs (all lines apart from the first one are not shown), so this commit adjusts `upsert` opt logic test accordingly. Fixes: cockroachdb#58158. Release note: None 58166: server: skip reset quorum testing r=yuzefovich a=TheSamHuang Temporarily skips TestResetQuorum and acceptance/reset-quorum. Release note: None. Co-authored-by: Yahor Yuzefovich <[email protected]> Co-authored-by: Sam Huang <[email protected]>
mokaixu · Dec 22, 2020 · f41f07c · f41f07c
3 parents e7a3427 + f5946b3 + 3f19f15
commit f41f07c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pkg/cmd/roachtest/reset_quorum.go b/pkg/cmd/roachtest/reset_quorum.go
@@ -16,10 +16,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/stretchr/testify/require"
 )
 
 func runResetQuorum(ctx context.Context, t *test, c *cluster) {
+	skip.WithIssue(t, 58165)
 	args := func(attr string) option {
 		return startArgs(
 			"-a=--attrs="+attr,

diff --git a/pkg/kv/kvserver/reset_quorum_test.go b/pkg/kv/kvserver/reset_quorum_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"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/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/errors"
@@ -48,6 +49,7 @@ import (
 // 5. A meta range (error expected).
 func TestResetQuorum(t *testing.T) {
 	defer leaktest.AfterTest(t)()
+	skip.WithIssue(t, 58165)
 	ctx := context.Background()
 
 	livenessDuration := 3000 * time.Millisecond

diff --git a/pkg/sql/opt/exec/execbuilder/testdata/upsert b/pkg/sql/opt/exec/execbuilder/testdata/upsert
@@ -372,7 +372,7 @@ flow                                  Put /Table/57/1/2/0 -> /TUPLE/2:2:Int/2
 flow                                  Del /Table/57/2/3/0
 flow                                  CPut /Table/57/2/2/0 -> /BYTES/0x8a (expecting does not exist)
 kv.DistSender: sending partial batch  r35: sending batch 1 Put, 1 EndTxn to (n1,s1):1
-exec stmt                             execution failed after 0 rows: duplicate key value violates unique constraint "woo"\nDETAIL: Key (v)=(2) already exists\.
+exec stmt                             execution failed after 0 rows: duplicate key value violates unique constraint "woo"
 
 
 subtest regression_32473