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

etcdserver: remove superfluous context

Browse Source
This commit is contained in:
Jonathan Boulle 2014-09-09 11:17:28 -07:00
parent 07ce8bc4bc
commit 44acd57ea4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdserver/etcdhttp/http_test.go
View File

@ -46,7 +46,7 @@ func TestBadParseRequest(t *testing.T) {
for i, tt := range tests {
got, err := parseRequest(tt.in, 1234)
if err == nil {
t.Errorf("case %d: unexpected nil error!")
t.Errorf("case %d: unexpected nil error!", i)
}
if !reflect.DeepEqual(got, etcdserverpb.Request{}) {
t.Errorf("case %d: unexpected non-empty Request: %#v", i, got)
@ -179,7 +179,6 @@ func (w *eventingWatcher) Remove() {}
func TestEncodeResponse(t *testing.T) {
tests := []struct {
ctx context.Context
resp etcdserver.Response
idx string
code int
@ -187,7 +186,6 @@ func TestEncodeResponse(t *testing.T) {
}{
// standard case, standard 200 response
{
context.Background(),
etcdserver.Response{
Event: &store.Event{
Action: store.Get,
@ -202,7 +200,6 @@ func TestEncodeResponse(t *testing.T) {
},
// check new nodes return StatusCreated
{
context.Background(),
etcdserver.Response{
Event: &store.Event{
Action: store.Create,
@ -216,7 +213,6 @@ func TestEncodeResponse(t *testing.T) {
nil,
},
{
context.Background(),
etcdserver.Response{
Watcher: &eventingWatcher{store.Create},
},
@ -228,7 +224,7 @@ func TestEncodeResponse(t *testing.T) {
for i, tt := range tests {
rw := httptest.NewRecorder()
err := encodeResponse(tt.ctx, rw, tt.resp)
err := encodeResponse(context.Background(), rw, tt.resp)
if err != tt.err {
t.Errorf("case %d: unexpected err: got %v, want %v", i, err, tt.err)
continue