From dcd64f2a598ae3e9f8a16398410ef1b322aae147 Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blake.mizerany@gmail.com>
Date: Tue, 2 Sep 2014 15:57:15 -0700
Subject: [PATCH] ...

---
 etcdserver2/etcdhttp/http_test.go | 10 +---------
 main.go                           |  5 +++++
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/etcdserver2/etcdhttp/http_test.go b/etcdserver2/etcdhttp/http_test.go
index 79e1a8125..92260e57f 100644
--- a/etcdserver2/etcdhttp/http_test.go
+++ b/etcdserver2/etcdhttp/http_test.go
@@ -11,7 +11,6 @@ import (
 	"code.google.com/p/go.net/context"
 
 	etcdserver "github.com/coreos/etcd/etcdserver2"
-	"github.com/coreos/etcd/etcdserver2/etcdserverpb"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/store"
@@ -33,14 +32,7 @@ func TestSet(t *testing.T) {
 		Node:  n,
 		Store: st,
 		Send:  etcdserver.SendFunc(nopSend),
-		Save: func(st raftpb.State, ents []raftpb.Entry) {
-			for _, e := range ents {
-				var r etcdserverpb.Request
-				if err := r.Unmarshal(e.Data); err != nil {
-					t.Fatal(err)
-				}
-			}
-		},
+		Save:  func(st raftpb.State, ents []raftpb.Entry) {},
 	}
 	etcdserver.Start(srv)
 	defer srv.Stop()
diff --git a/main.go b/main.go
index 6b369ddd9..bf8df0a5c 100644
--- a/main.go
+++ b/main.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"strconv"
 	"time"
+	"code.google.com/p/go.net/context"
 
 	etcdserver "github.com/coreos/etcd/etcdserver2"
 	"github.com/coreos/etcd/etcdserver2/etcdhttp"
@@ -39,6 +40,10 @@ func main() {
 	}
 
 	n := raft.Start(id, peers.Ids())
+
+	ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
+	n.Campaign(ctx)
+
 	s := &etcdserver.Server{
 		Store: store.New(),
 		Node:  n,