Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

functional-tester/tester: fix "Desc" calls

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-04 13:53:43 -07:00
parent d7b468ec6f
commit a7ec9f28e3
3 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/functional-tester/tester/cluster.go
View File

@ -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...)
}
}
}

29
tools/functional-tester/tester/failure.go
View File

@ -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
}

14
tools/functional-tester/tester/failure_case_no_fail.go
View File

@ -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
}