From 3ced4443baf7da51daa236f4ebe7a92a4b125a38 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Mon, 2 Apr 2018 09:31:31 -0700
Subject: [PATCH] functional-tester/tester: add "failureStrings"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 tools/functional-tester/tester/cluster.go        |  8 ++++++++
 tools/functional-tester/tester/cluster_test.go   | 15 +++------------
 tools/functional-tester/tester/cluster_tester.go |  1 +
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/functional-tester/tester/cluster.go b/tools/functional-tester/tester/cluster.go
index 461a5ae8a..bb4a13019 100644
--- a/tools/functional-tester/tester/cluster.go
+++ b/tools/functional-tester/tester/cluster.go
@@ -302,6 +302,14 @@ func (clus *Cluster) updateFailures() {
 	}
 }
 
+func (clus *Cluster) failureStrings() (fs []string) {
+	fs = make([]string, len(clus.failures))
+	for i := range clus.failures {
+		fs[i] = clus.failures[i].Desc()
+	}
+	return fs
+}
+
 func (clus *Cluster) shuffleFailures() {
 	rand.Seed(time.Now().UnixNano())
 	offset := rand.Intn(1000)
diff --git a/tools/functional-tester/tester/cluster_test.go b/tools/functional-tester/tester/cluster_test.go
index 011d1e1ab..82a785621 100644
--- a/tools/functional-tester/tester/cluster_test.go
+++ b/tools/functional-tester/tester/cluster_test.go
@@ -165,25 +165,16 @@ func Test_newCluster(t *testing.T) {
 	cfg.logger = logger
 
 	cfg.updateFailures()
-	fs1 := make([]string, len(cfg.failures))
-	for i := range cfg.failures {
-		fs1[i] = cfg.failures[i].Desc()
-	}
+	fs1 := cfg.failureStrings()
 
 	cfg.shuffleFailures()
-	fs2 := make([]string, len(cfg.failures))
-	for i := range cfg.failures {
-		fs2[i] = cfg.failures[i].Desc()
-	}
+	fs2 := cfg.failureStrings()
 	if reflect.DeepEqual(fs1, fs2) {
 		t.Fatalf("expected shuffled failure cases, got %q", fs2)
 	}
 
 	cfg.shuffleFailures()
-	fs3 := make([]string, len(cfg.failures))
-	for i := range cfg.failures {
-		fs3[i] = cfg.failures[i].Desc()
-	}
+	fs3 := cfg.failureStrings()
 	if reflect.DeepEqual(fs2, fs3) {
 		t.Fatalf("expected reshuffled failure cases from %q, got %q", fs2, fs3)
 	}
diff --git a/tools/functional-tester/tester/cluster_tester.go b/tools/functional-tester/tester/cluster_tester.go
index 0605bb15d..0adb0ad92 100644
--- a/tools/functional-tester/tester/cluster_tester.go
+++ b/tools/functional-tester/tester/cluster_tester.go
@@ -109,6 +109,7 @@ func (clus *Cluster) doRound(round int) error {
 	if clus.Tester.FailureShuffle {
 		clus.shuffleFailures()
 	}
+
 	for i, f := range clus.failures {
 		clus.cs = i