From 38e32a1b54d7bb0610f216255be9787d56e5fc3c Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 16 Apr 2018 14:16:33 -0700 Subject: [PATCH] snapshot: ignore server logs Signed-off-by: Gyuho Lee --- Makefile | 1 + snapshot/member_test.go | 3 +++ snapshot/v3_snapshot_test.go | 9 +++++++++ 3 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 3eb4678c2..96dcac593 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ clean: rm -rf ./gopath rm -rf ./gopath.proto rm -rf ./release + rm -f ./snapshot/localhost:* rm -f ./integration/127.0.0.1:* ./integration/localhost:* rm -f ./clientv3/integration/127.0.0.1:* ./clientv3/integration/localhost:* rm -f ./clientv3/ordering/127.0.0.1:* ./clientv3/ordering/localhost:* diff --git a/snapshot/member_test.go b/snapshot/member_test.go index 23ca52af1..68d56d28d 100644 --- a/snapshot/member_test.go +++ b/snapshot/member_test.go @@ -63,6 +63,9 @@ func TestSnapshotV3RestoreMultiMemberAdd(t *testing.T) { time.Sleep(testutil.ApplyTimeout) cfg := embed.NewConfig() + cfg.Logger = "zap" + cfg.LogOutput = "io-discard" + cfg.Debug = false cfg.Name = "3" cfg.InitialClusterToken = testClusterTkn cfg.ClusterState = "existing" diff --git a/snapshot/v3_snapshot_test.go b/snapshot/v3_snapshot_test.go index 2aed7b014..47b6d311b 100644 --- a/snapshot/v3_snapshot_test.go +++ b/snapshot/v3_snapshot_test.go @@ -43,6 +43,9 @@ func TestSnapshotV3RestoreSingle(t *testing.T) { cURLs, pURLs := urls[:clusterN], urls[clusterN:] cfg := embed.NewConfig() + cfg.Logger = "zap" + cfg.LogOutput = "io-discard" + cfg.Debug = false cfg.Name = "s1" cfg.InitialClusterToken = testClusterTkn cfg.ClusterState = "existing" @@ -149,6 +152,9 @@ func createSnapshotFile(t *testing.T, kvs []kv) string { cURLs, pURLs := urls[:clusterN], urls[clusterN:] cfg := embed.NewConfig() + cfg.Logger = "zap" + cfg.LogOutput = "io-discard" + cfg.Debug = false cfg.Name = "default" cfg.ClusterState = "new" cfg.LCUrls, cfg.ACUrls = cURLs, cURLs @@ -213,6 +219,9 @@ func restoreCluster(t *testing.T, clusterN int, dbPath string) ( cfgs := make([]*embed.Config, clusterN) for i := 0; i < clusterN; i++ { cfg := embed.NewConfig() + cfg.Logger = "zap" + cfg.LogOutput = "io-discard" + cfg.Debug = false cfg.Name = fmt.Sprintf("%d", i) cfg.InitialClusterToken = testClusterTkn cfg.ClusterState = "existing"