From a7ec9f28e3bac1b68e19d817ec844e0fb44de9ce Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 4 Apr 2018 13:53:43 -0700 Subject: [PATCH] functional-tester/tester: fix "Desc" calls Signed-off-by: Gyuho Lee --- tools/functional-tester/tester/cluster.go | 12 ++++---- tools/functional-tester/tester/failure.go | 29 +++++++++++++++++-- .../tester/failure_case_no_fail.go | 14 +++++++++ 3 files changed, 47 insertions(+), 8 deletions(-) diff --git a/tools/functional-tester/tester/cluster.go b/tools/functional-tester/tester/cluster.go index 303b93f97..cc747a800 100644 --- a/tools/functional-tester/tester/cluster.go +++ b/tools/functional-tester/tester/cluster.go @@ -287,18 +287,18 @@ func (clus *Cluster) updateFailures() { clus.failures = append(clus.failures, newFailureDelayPeerPortTxRxLeader(clus)) case "DELAY_PEER_PORT_TX_RX_ALL": clus.failures = append(clus.failures, newFailureDelayPeerPortTxRxAll(clus)) - case "FAILPOINTS": - fpFailures, fperr := failpointFailures(clus) - if len(fpFailures) == 0 { - clus.lg.Info("no failpoints found!", zap.Error(fperr)) - } - clus.failures = append(clus.failures, fpFailures...) case "NO_FAIL_WITH_STRESS": clus.failures = append(clus.failures, newFailureNoFailWithStress(clus)) case "NO_FAIL_WITH_NO_STRESS_FOR_LIVENESS": clus.failures = append(clus.failures, newFailureNoFailWithNoStressForLiveness(clus)) case "EXTERNAL": clus.failures = append(clus.failures, newFailureExternal(clus.Tester.ExternalExecPath)) + case "FAILPOINTS": + fpFailures, fperr := failpointFailures(clus) + if len(fpFailures) == 0 { + clus.lg.Info("no failpoints found!", zap.Error(fperr)) + } + clus.failures = append(clus.failures, fpFailures...) } } } diff --git a/tools/functional-tester/tester/failure.go b/tools/functional-tester/tester/failure.go index 3aec58e3e..f9c205512 100644 --- a/tools/functional-tester/tester/failure.go +++ b/tools/functional-tester/tester/failure.go @@ -99,7 +99,16 @@ func (f *failureFollower) Recover(clus *Cluster) error { return f.recoverMember(clus, f.last) } -func (f *failureFollower) FailureCase() rpcpb.FailureCase { return f.failureCase } +func (f *failureFollower) Desc() string { + if string(f.desc) != "" { + return string(f.desc) + } + return f.failureCase.String() +} + +func (f *failureFollower) FailureCase() rpcpb.FailureCase { + return f.failureCase +} type failureLeader struct { failureByFunc @@ -152,7 +161,16 @@ func (f *failureQuorum) Recover(clus *Cluster) error { return nil } -func (f *failureQuorum) FailureCase() rpcpb.FailureCase { return f.failureCase } +func (f *failureQuorum) Desc() string { + if string(f.desc) != "" { + return string(f.desc) + } + return f.failureCase.String() +} + +func (f *failureQuorum) FailureCase() rpcpb.FailureCase { + return f.failureCase +} type failureAll failureByFunc @@ -174,6 +192,13 @@ func (f *failureAll) Recover(clus *Cluster) error { return nil } +func (f *failureAll) Desc() string { + if string(f.desc) != "" { + return string(f.desc) + } + return f.failureCase.String() +} + func (f *failureAll) FailureCase() rpcpb.FailureCase { return f.failureCase } diff --git a/tools/functional-tester/tester/failure_case_no_fail.go b/tools/functional-tester/tester/failure_case_no_fail.go index f7b0dcad3..221929960 100644 --- a/tools/functional-tester/tester/failure_case_no_fail.go +++ b/tools/functional-tester/tester/failure_case_no_fail.go @@ -32,6 +32,13 @@ func (f *failureNoFailWithStress) Recover(clus *Cluster) error { return nil } +func (f *failureNoFailWithStress) Desc() string { + if f.desc.Desc() != "" { + return f.desc.Desc() + } + return f.failureCase.String() +} + func (f *failureNoFailWithStress) FailureCase() rpcpb.FailureCase { return f.failureCase } @@ -70,6 +77,13 @@ func (f *failureNoFailWithNoStressForLiveness) Recover(clus *Cluster) error { return nil } +func (f *failureNoFailWithNoStressForLiveness) Desc() string { + if f.desc.Desc() != "" { + return f.desc.Desc() + } + return f.failureCase.String() +} + func (f *failureNoFailWithNoStressForLiveness) FailureCase() rpcpb.FailureCase { return f.failureCase }