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

*: fix govet -shadow in go tip

Browse Source
This commit is contained in:
Gyu-Ho Lee 2016-04-14 23:56:26 -07:00
parent 4ee7cad116
commit 641a1a66e1
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdserver/api/v2http/client_auth_test.go
View File

@ -53,11 +53,11 @@ func (s *mockAuthStore) GetUser(name string) (auth.User, error) {
} }
func (s *mockAuthStore) CreateOrUpdateUser(user auth.User) (out auth.User, created bool, err error) { func (s *mockAuthStore) CreateOrUpdateUser(user auth.User) (out auth.User, created bool, err error) {
if s.users == nil { if s.users == nil {
u, err := s.CreateUser(user) out, err = s.CreateUser(user)
return u, true, err return out, true, err
} }
u, err := s.UpdateUser(user) out, err = s.UpdateUser(user)
return u, false, err return out, false, err
} }
func (s *mockAuthStore) CreateUser(user auth.User) (auth.User, error) { return user, s.err } func (s *mockAuthStore) CreateUser(user auth.User) (auth.User, error) { return user, s.err }
func (s *mockAuthStore) DeleteUser(name string) error { return s.err } func (s *mockAuthStore) DeleteUser(name string) error { return s.err }

5
etcdserver/server.go
View File

@ -296,7 +296,8 @@ func NewServer(cfg *ServerConfig) (srv *EtcdServer, err error) {
if err != nil { if err != nil {
return nil, &DiscoveryError{Op: "join", Err: err} return nil, &DiscoveryError{Op: "join", Err: err}
} }
urlsmap, err := types.NewURLsMap(str) var urlsmap types.URLsMap
urlsmap, err = types.NewURLsMap(str)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -329,7 +330,7 @@ func NewServer(cfg *ServerConfig) (srv *EtcdServer, err error) {
return nil, err return nil, err
} }
if snapshot != nil { if snapshot != nil {
if err := st.Recovery(snapshot.Data); err != nil { if err = st.Recovery(snapshot.Data); err != nil {
plog.Panicf("recovered store from snapshot error: %v", err) plog.Panicf("recovered store from snapshot error: %v", err)
} }
plog.Infof("recovered store from snapshot at index %d", snapshot.Metadata.Index) plog.Infof("recovered store from snapshot at index %d", snapshot.Metadata.Index)

8
etcdserver/server_test.go
View File

@ -654,11 +654,11 @@ func TestDoProposal(t *testing.T) {
} }
func TestDoProposalCancelled(t *testing.T) { func TestDoProposalCancelled(t *testing.T) {
wait := mockwait.NewRecorder() wt := mockwait.NewRecorder()
srv := &EtcdServer{ srv := &EtcdServer{
cfg: &ServerConfig{TickMs: 1}, cfg: &ServerConfig{TickMs: 1},
r: raftNode{Node: newNodeNop()}, r: raftNode{Node: newNodeNop()},
w: wait, w: wt,
reqIDGen: idutil.NewGenerator(0, time.Time{}), reqIDGen: idutil.NewGenerator(0, time.Time{}),
} }
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
@ -669,8 +669,8 @@ func TestDoProposalCancelled(t *testing.T) {
t.Fatalf("err = %v, want %v", err, ErrCanceled) t.Fatalf("err = %v, want %v", err, ErrCanceled)
} }
w := []testutil.Action{{Name: "Register"}, {Name: "Trigger"}} w := []testutil.Action{{Name: "Register"}, {Name: "Trigger"}}
if !reflect.DeepEqual(wait.Action(), w) { if !reflect.DeepEqual(wt.Action(), w) {
t.Errorf("wait.action = %+v, want %+v", wait.Action(), w) t.Errorf("wt.action = %+v, want %+v", wt.Action(), w)
} }
} }

2
rafthttp/stream.go
View File

@ -382,7 +382,7 @@ func (cr *streamReader) dial(t streamType) (io.ReadCloser, error) {
req, err := http.NewRequest("GET", uu.String(), nil) req, err := http.NewRequest("GET", uu.String(), nil)
if err != nil { if err != nil {
cr.picker.unreachable(u) cr.picker.unreachable(u)
return nil, fmt.Errorf("failed to make http request to %s (%v)", u, err) return nil, fmt.Errorf("failed to make http request to %v (%v)", u, err)
} }
req.Header.Set("X-Server-From", cr.local.String()) req.Header.Set("X-Server-From", cr.local.String())
req.Header.Set("X-Server-Version", version.Version) req.Header.Set("X-Server-Version", version.Version)

8
tools/functional-tester/etcd-agent/agent.go
View File

@ -95,16 +95,16 @@ func sigtermAndWait(cmd *exec.Cmd) error {
errc := make(chan error) errc := make(chan error)
go func() { go func() {
_, err := cmd.Process.Wait() _, ew := cmd.Process.Wait()
errc <- err errc <- ew
close(errc) close(errc)
}() }()
select { select {
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
cmd.Process.Kill() cmd.Process.Kill()
case err := <-errc: case e := <-errc:
return err return e
} }
err = <-errc err = <-errc
return err return err

5
wal/wal_test.go
View File

@ -184,7 +184,7 @@ func TestCut(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
snap := walpb.Snapshot{Index: 2, Term: 1} snap := walpb.Snapshot{Index: 2, Term: 1}
if err := w.SaveSnapshot(snap); err != nil { if err = w.SaveSnapshot(snap); err != nil {
t.Fatal(err) t.Fatal(err)
} }
wname = walName(2, 2) wname = walName(2, 2)
@ -506,7 +506,8 @@ func TestReleaseLockTo(t *testing.T) {
t.Errorf("len(w.locks) = %d, want %d", len(w.locks), 7) t.Errorf("len(w.locks) = %d, want %d", len(w.locks), 7)
} }
for i, l := range w.locks { for i, l := range w.locks {
_, lockIndex, err := parseWalName(path.Base(l.Name())) var lockIndex uint64
_, lockIndex, err = parseWalName(path.Base(l.Name()))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }