浏览代码

*: disable gRPC client logs in tests

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
Gyu-Ho Lee 8 年之前
父节点
当前提交
5a154e8e2b
共有 4 个文件被更改,包括 11 次插入4 次删除
  1. 3 1
      clientv3/integration/logger_test.go
  2. 3 1
      clientv3/ordering/logger_test.go
  3. 3 1
      integration/logger_test.go
  4. 2 1
      store/store_v2v3_test.go

+ 3 - 1
clientv3/integration/logger_test.go

@@ -17,11 +17,13 @@ package integration
 import (
 	"io/ioutil"
 
+	"github.com/coreos/etcd/clientv3"
+
 	"github.com/coreos/pkg/capnslog"
 	"google.golang.org/grpc/grpclog"
 )
 
 func init() {
 	capnslog.SetGlobalLogLevel(capnslog.CRITICAL)
-	grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
+	clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 }

+ 3 - 1
clientv3/ordering/logger_test.go

@@ -17,11 +17,13 @@ package ordering
 import (
 	"io/ioutil"
 
+	"github.com/coreos/etcd/clientv3"
+
 	"github.com/coreos/pkg/capnslog"
 	"google.golang.org/grpc/grpclog"
 )
 
 func init() {
 	capnslog.SetGlobalLogLevel(capnslog.CRITICAL)
-	grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
+	clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 }

+ 3 - 1
integration/logger_test.go

@@ -17,6 +17,8 @@ package integration
 import (
 	"io/ioutil"
 
+	"github.com/coreos/etcd/clientv3"
+
 	"github.com/coreos/pkg/capnslog"
 	"google.golang.org/grpc/grpclog"
 )
@@ -25,5 +27,5 @@ const defaultLogLevel = capnslog.CRITICAL
 
 func init() {
 	capnslog.SetGlobalLogLevel(defaultLogLevel)
-	grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
+	clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 }

+ 2 - 1
store/store_v2v3_test.go

@@ -20,6 +20,7 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/etcdserver/api/v2v3"
 	"github.com/coreos/etcd/integration"
 	"github.com/coreos/etcd/store"
@@ -30,7 +31,7 @@ import (
 
 func init() {
 	capnslog.SetGlobalLogLevel(capnslog.CRITICAL)
-	grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
+	clientv3.SetLogger(grpclog.NewLoggerV2(ioutil.Discard, ioutil.Discard, ioutil.Discard))
 }
 
 type v2v3TestStore struct {