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

clientv3/concurrency: fix govet errors

Browse Source 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2018-12-05 18:28:13 -08:00
parent 12b19ff5ea
commit 510ae3d2a2
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
clientv3/concurrency/election_test.go
View File

@ -17,11 +17,9 @@ package concurrency_test
import ( import (
"context" "context"
"log" "log"
"testing"
"time"
"strings" "strings"
"testing"
"time"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency" "go.etcd.io/etcd/clientv3/concurrency"
@ -36,7 +34,8 @@ func TestResumeElection(t *testing.T) {
} }
defer cli.Close() defer cli.Close()
s, err := concurrency.NewSession(cli) var s *concurrency.Session
s, err = concurrency.NewSession(cli)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -44,17 +43,18 @@ func TestResumeElection(t *testing.T) {
e := concurrency.NewElection(s, prefix) e := concurrency.NewElection(s, prefix)
// Entire test should never take more than 10 seconds // entire test should never take more than 10 seconds
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel() defer cancel()
// Become leader // become leader
if err := e.Campaign(ctx, "candidate1"); err != nil { if err = e.Campaign(ctx, "candidate1"); err != nil {
t.Fatalf("Campaign() returned non nil err: %s", err) t.Fatalf("Campaign() returned non nil err: %s", err)
} }
// Get the leadership details of the current election // get the leadership details of the current election
leader, err := e.Leader(ctx) var leader *clientv3.GetResponse
leader, err = e.Leader(ctx)
if err != nil { if err != nil {
t.Fatalf("Leader() returned non nil err: %s", err) t.Fatalf("Leader() returned non nil err: %s", err)
} }
@ -83,34 +83,34 @@ func TestResumeElection(t *testing.T) {
} }
}() }()
// Wait until observe goroutine is running // wait until observe goroutine is running
<-respChan <-respChan
// Put some random data to generate a change event, this put should be // put some random data to generate a change event, this put should be
// ignored by Observe() because it is not under the election prefix. // ignored by Observe() because it is not under the election prefix.
_, err = cli.Put(ctx, "foo", "bar") _, err = cli.Put(ctx, "foo", "bar")
if err != nil { if err != nil {
t.Fatalf("Put('foo') returned non nil err: %s", err) t.Fatalf("Put('foo') returned non nil err: %s", err)
} }
// Resign as leader // resign as leader
if err := e.Resign(ctx); err != nil { if err := e.Resign(ctx); err != nil {
t.Fatalf("Resign() returned non nil err: %s", err) t.Fatalf("Resign() returned non nil err: %s", err)
} }
// Elect a different candidate // elect a different candidate
if err := e.Campaign(ctx, "candidate2"); err != nil { if err := e.Campaign(ctx, "candidate2"); err != nil {
t.Fatalf("Campaign() returned non nil err: %s", err) t.Fatalf("Campaign() returned non nil err: %s", err)
} }
// Wait for observed leader change // wait for observed leader change
resp := <-respChan resp := <-respChan
kv := resp.Kvs[0] kv := resp.Kvs[0]
if !strings.HasPrefix(string(kv.Key), prefix) { if !strings.HasPrefix(string(kv.Key), prefix) {
t.Errorf("expected observed election to have prefix '%s' got '%s'", prefix, string(kv.Key)) t.Errorf("expected observed election to have prefix '%s' got %q", prefix, string(kv.Key))
} }
if string(kv.Value) != "candidate2" { if string(kv.Value) != "candidate2" {
t.Errorf("expected new leader to be 'candidate1' got '%s'", string(kv.Value)) t.Errorf("expected new leader to be 'candidate1' got %q", string(kv.Value))
} }
} }