use zap as logger in test because capsnlog has a race error

edegens · Mar 23, 2020 · 47a5777 · 47a5777
1 parent 25efea5
commit 47a5777
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/cluster/cluster_test.go b/cluster/cluster_test.go
@@ -79,6 +79,7 @@ func (suite *ClusterSuite) TestMemberAdd() {
 		}
 		memberCfg.etcdConfig.Name = "node2"
 		memberCfg.etcdConfig.Dir = "tmp2"
+		memberCfg.etcdConfig.Logger = "zap"
 		memberCfg.etcdConfig.LPUrls = []url.URL{*LPUrl}
 		memberCfg.etcdConfig.LCUrls = []url.URL{*LCUrl}
 		memberCfg.etcdConfig.APUrls = []url.URL{*LPUrl}
@@ -114,6 +115,7 @@ func (suite *ClusterSuite) TestMemberAdd() {
 		}
 		memberCfg.etcdConfig.Name = "node3"
 		memberCfg.etcdConfig.Dir = "tmp3"
+		memberCfg.etcdConfig.Logger = "zap"
 		memberCfg.etcdConfig.LPUrls = []url.URL{*LPUrl, *LPUrl2}
 		memberCfg.etcdConfig.LCUrls = []url.URL{*LCUrl, *LCUrl2}
 		memberCfg.etcdConfig.APUrls = []url.URL{*LPUrl, *LPUrl2}
@@ -144,6 +146,7 @@ func (suite *ClusterSuite) TestMemberAdd() {
 			}
 			memberCfg.etcdConfig.Name = "node4"
 			memberCfg.etcdConfig.Dir = "tmp4"
+			memberCfg.etcdConfig.Logger = "zap"
 			memberCfg.etcdConfig.LPUrls = []url.URL{*LPUrl}
 			memberCfg.etcdConfig.LCUrls = []url.URL{*LCUrl}
 			memberCfg.etcdConfig.APUrls = []url.URL{*LPUrl}

diff --git a/cluster/registry_test.go b/cluster/registry_test.go
@@ -237,6 +237,7 @@ func (suite *EtcdDependentSuite) TestEtcdRegistry_nodes() {
 
 func startTestEtcd() ([]string, func()) {
 	cfg := embed.NewConfig()
+	cfg.Logger = "zap"
 
 	tmp, err := ioutil.TempDir("", "test_etcd")
 	cfg.Dir = tmp

diff --git a/cluster/testdata/node1.yml b/cluster/testdata/node1.yml
@@ -28,3 +28,5 @@ initial-cluster-token: 'etcd-cluster'
 initial-cluster-state: 'new'
 
 strict-reconfig-check: false
+
+logger: 'zap'