From e830bb62d76c3cb303bb91cb471967393c84ca99 Mon Sep 17 00:00:00 2001
From: Tobias Schottdorf <tobias.schottdorf@gmail.com>
Date: Thu, 17 Jan 2019 09:24:49 +0100
Subject: [PATCH] acceptance: properly skip acceptance/bank/zerosum-restart

Touches #33683.

Release note: None
---
 pkg/cmd/roachtest/acceptance.go | 40 +++++++++++++++++----------------
 pkg/cmd/roachtest/bank.go       |  1 +
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/pkg/cmd/roachtest/acceptance.go b/pkg/cmd/roachtest/acceptance.go
index 42fa4a0f0819..02de80f82b94 100644
--- a/pkg/cmd/roachtest/acceptance.go
+++ b/pkg/cmd/roachtest/acceptance.go
@@ -25,31 +25,32 @@ func registerAcceptance(r *registry) {
 	// local mode the acceptance tests should be configured to run within a
 	// minute or so as these tests are run on every merge to master.
 
-	// NB: zerosum-restart is skipped due to generating various errors during
-	// its rebalances. See the comment on:
-	_ = isExpectedRelocateError
-
 	testCases := []struct {
 		name string
 		fn   func(ctx context.Context, t *test, c *cluster)
+		skip string
 	}{
 		// Sorted. Please keep it that way.
-		{"bank/cluster-recovery", runBankClusterRecovery},
-		{"bank/node-restart", runBankNodeRestart},
-		{"bank/zerosum-splits", runBankNodeZeroSum},
+		{name: "bank/cluster-recovery", fn: runBankClusterRecovery},
+		{name: "bank/node-restart", fn: runBankNodeRestart},
+		{
+			name: "bank/zerosum-splits", fn: runBankNodeZeroSum,
+			skip: "https://github.com/cockroachdb/cockroach/issues/33683 (runs " +
+				"into various errors during its rebalances, see isExpectedRelocateError)",
+		},
 		// {"bank/zerosum-restart", runBankZeroSumRestart},
-		{"build-info", runBuildInfo},
-		{"cli/node-status", runCLINodeStatus},
-		{"decommission", runDecommissionAcceptance},
-		{"cluster-init", runClusterInit},
-		{"event-log", runEventLog},
-		{"gossip/peerings", runGossipPeerings},
-		{"gossip/restart", runGossipRestart},
-		{"gossip/restart-node-one", runGossipRestartNodeOne},
-		{"gossip/locality-address", runCheckLocalityIPAddress},
-		{"rapid-restart", runRapidRestart},
-		{"status-server", runStatusServer},
-		{"version-upgrade", runVersionUpgrade},
+		{name: "build-info", fn: runBuildInfo},
+		{name: "cli/node-status", fn: runCLINodeStatus},
+		{name: "decommission", fn: runDecommissionAcceptance},
+		{name: "cluster-init", fn: runClusterInit},
+		{name: "event-log", fn: runEventLog},
+		{name: "gossip/peerings", fn: runGossipPeerings},
+		{name: "gossip/restart", fn: runGossipRestart},
+		{name: "gossip/restart-node-one", fn: runGossipRestartNodeOne},
+		{name: "gossip/locality-address", fn: runCheckLocalityIPAddress},
+		{name: "rapid-restart", fn: runRapidRestart},
+		{name: "status-server", fn: runStatusServer},
+		{name: "version-upgrade", fn: runVersionUpgrade},
 	}
 	tags := []string{"default", "quick"}
 	const numNodes = 4
@@ -68,6 +69,7 @@ func registerAcceptance(r *registry) {
 	for _, tc := range testCases {
 		tc := tc
 		spec.SubTests = append(spec.SubTests, testSpec{
+			Skip:    tc.skip,
 			Name:    tc.name,
 			Timeout: 10 * time.Minute,
 			Tags:    tags,
diff --git a/pkg/cmd/roachtest/bank.go b/pkg/cmd/roachtest/bank.go
index 7188cf1c6754..d6b7eabfc090 100644
--- a/pkg/cmd/roachtest/bank.go
+++ b/pkg/cmd/roachtest/bank.go
@@ -349,6 +349,7 @@ func isExpectedRelocateError(err error) bool {
 	// https://github.com/cockroachdb/cockroach/issues/33732
 	// https://github.com/cockroachdb/cockroach/issues/33708
 	// https://github.cm/cockroachdb/cockroach/issues/34012
+	// https://github.com/cockroachdb/cockroach/issues/33683#issuecomment-454889149
 	// for more failure modes not caught here. We decided to avoid adding
 	// to this catchall and to fix the root causes instead.
 	// We've also seen "breaker open" errors here.