Merge #33549

33549: acceptance: re-enable bank/zerosum-restart r=petermattis a=tbg This was forgotten, #30064 is long fixed :fingers_crossed: Release note: None Co-authored-by: Tobias Schottdorf <[email protected]>
cockroachdb · Jan 11, 2019 · 6749d81 · 6749d81
2 parents f5e3c29 + 1b3fe9c
commit 6749d81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pkg/cmd/roachtest/acceptance.go b/pkg/cmd/roachtest/acceptance.go
@@ -33,9 +33,7 @@ func registerAcceptance(r *registry) {
 		{"bank/cluster-recovery", runBankClusterRecovery},
 		{"bank/node-restart", runBankNodeRestart},
 		{"bank/zerosum-splits", runBankNodeZeroSum},
-		//TODO(masha) This is flaking for same reasons as bank/node-restart
-		// enable after #30064 is fixed.
-		//{"bank/zerosum-restart", runBankZeroSumRestart},
+		{"bank/zerosum-restart", runBankZeroSumRestart},
 		{"build-info", runBuildInfo},
 		{"cli/node-status", runCLINodeStatus},
 		{"decommission", runDecommissionAcceptance},

diff --git a/pkg/cmd/roachtest/bank.go b/pkg/cmd/roachtest/bank.go
@@ -345,7 +345,7 @@ func (s *bankState) startSplitMonkey(ctx context.Context, d time.Duration, c *cl
 }
 
 func isExpectedRelocateError(err error) bool {
-	return testutils.IsError(err, "(descriptor changed|unable to remove replica .* which is not present|unable to add replica .* which is already present|received invalid ChangeReplicasTrigger .* to remove self)")
+	return testutils.IsError(err, "(descriptor changed|unable to remove replica .* which is not present|unable to add replica .* which is already present|received invalid ChangeReplicasTrigger .* to remove self|breaker open)")
 }
 
 func accountDistribution(r *rand.Rand) *rand.Zipf {