Merge pull request #1651 from jonboulle/discard

etcdserver: discard log output in tests

etcdserver/server_test.go

@@ -19,6 +19,8 @@ package etcdserver
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"log"
 	"math/rand"
 	"path"
 	"reflect"
@@ -36,6 +38,10 @@ import (
 	"github.com/coreos/etcd/store"
 )
 
+func init() {
+	log.SetOutput(ioutil.Discard)
+}
+
 func TestGetExpirationTime(t *testing.T) {
 	tests := []struct {
 		r    pb.Request