functional/tester: fix govet errors

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
etcd-io · Apr 12, 2018 · 554dfaa · 554dfaa
1 parent 099f109
commit 554dfaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/functional/tester/case_sigquit_remove_quorum.go b/functional/tester/case_sigquit_remove_quorum.go
@@ -48,17 +48,16 @@ func (c *fetchSnapshotCaseQuorum) Inject(clus *Cluster) error {
  )
  var resp *rpcpb.Response
  resp, err = clus.sendOpWithResp(lead, rpcpb.Operation_SAVE_SNAPSHOT)
- if resp == nil || err != nil {
- resp, err = clus.sendOpWithResp(lead, rpcpb.Operation_SAVE_SNAPSHOT)
+ if resp == nil || (resp != nil && !resp.Success) || err != nil {
  clus.lg.Info(
- "save snapshot on leader node END",
+ "save snapshot on leader node FAIL",
  zap.String("target-endpoint", clus.Members[lead].EtcdClientEndpoint),
  zap.Error(err),
  )
  return err
  }
  clus.lg.Info(
- "save snapshot on leader node END",
+ "save snapshot on leader node SUCCESS",
  zap.String("target-endpoint", clus.Members[lead].EtcdClientEndpoint),
  zap.String("member-name", resp.SnapshotInfo.MemberName),
  zap.Strings("member-client-urls", resp.SnapshotInfo.MemberClientURLs),

diff --git a/functional/tester/checker_kv_hash.go b/functional/tester/checker_kv_hash.go
@@ -27,7 +27,6 @@ const retries = 7
 
 type kvHashChecker struct {
  ctype rpcpb.Checker
- lg *zap.Logger
  clus *Cluster
 }