Skip to content

Commit 510ae3d

Browse files
committed
clientv3/concurrency: fix govet errors
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
1 parent 12b19ff commit 510ae3d

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

clientv3/concurrency/election_test.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@ package concurrency_test
1717
import (
1818
"context"
1919
"log"
20+
"strings"
2021
"testing"
21-
2222
"time"
2323

24-
"strings"
25-
2624
"go.etcd.io/etcd/clientv3"
2725
"go.etcd.io/etcd/clientv3/concurrency"
2826
)
@@ -36,25 +34,27 @@ func TestResumeElection(t *testing.T) {
3634
}
3735
defer cli.Close()
3836

39-
s, err := concurrency.NewSession(cli)
37+
var s *concurrency.Session
38+
s, err = concurrency.NewSession(cli)
4039
if err != nil {
4140
log.Fatal(err)
4241
}
4342
defer s.Close()
4443

4544
e := concurrency.NewElection(s, prefix)
4645

47-
// Entire test should never take more than 10 seconds
46+
// entire test should never take more than 10 seconds
4847
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
4948
defer cancel()
5049

51-
// Become leader
52-
if err := e.Campaign(ctx, "candidate1"); err != nil {
50+
// become leader
51+
if err = e.Campaign(ctx, "candidate1"); err != nil {
5352
t.Fatalf("Campaign() returned non nil err: %s", err)
5453
}
5554

56-
// Get the leadership details of the current election
57-
leader, err := e.Leader(ctx)
55+
// get the leadership details of the current election
56+
var leader *clientv3.GetResponse
57+
leader, err = e.Leader(ctx)
5858
if err != nil {
5959
t.Fatalf("Leader() returned non nil err: %s", err)
6060
}
@@ -83,34 +83,34 @@ func TestResumeElection(t *testing.T) {
8383
}
8484
}()
8585

86-
// Wait until observe goroutine is running
86+
// wait until observe goroutine is running
8787
<-respChan
8888

89-
// Put some random data to generate a change event, this put should be
89+
// put some random data to generate a change event, this put should be
9090
// ignored by Observe() because it is not under the election prefix.
9191
_, err = cli.Put(ctx, "foo", "bar")
9292
if err != nil {
9393
t.Fatalf("Put('foo') returned non nil err: %s", err)
9494
}
9595

96-
// Resign as leader
96+
// resign as leader
9797
if err := e.Resign(ctx); err != nil {
9898
t.Fatalf("Resign() returned non nil err: %s", err)
9999
}
100100

101-
// Elect a different candidate
101+
// elect a different candidate
102102
if err := e.Campaign(ctx, "candidate2"); err != nil {
103103
t.Fatalf("Campaign() returned non nil err: %s", err)
104104
}
105105

106-
// Wait for observed leader change
106+
// wait for observed leader change
107107
resp := <-respChan
108108

109109
kv := resp.Kvs[0]
110110
if !strings.HasPrefix(string(kv.Key), prefix) {
111-
t.Errorf("expected observed election to have prefix '%s' got '%s'", prefix, string(kv.Key))
111+
t.Errorf("expected observed election to have prefix '%s' got %q", prefix, string(kv.Key))
112112
}
113113
if string(kv.Value) != "candidate2" {
114-
t.Errorf("expected new leader to be 'candidate1' got '%s'", string(kv.Value))
114+
t.Errorf("expected new leader to be 'candidate1' got %q", string(kv.Value))
115115
}
116116
}

0 commit comments

Comments
 (0)