mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integration,embed: ignore embed log output

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee
2018-04-16 14:22:29 -07:00
parent cc778746fc
commit 35a80bc910
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
embed/config_test.go
View File

@ -33,10 +33,16 @@ func TestConfigFileOtherFields(t *testing.T) {
ClientSecurityCfgFile securityConfig `json:"client-transport-security"` ClientSecurityCfgFile securityConfig `json:"client-transport-security"`
PeerSecurityCfgFile securityConfig `json:"peer-transport-security"` PeerSecurityCfgFile securityConfig `json:"peer-transport-security"`
ForceNewCluster bool `json:"force-new-cluster"` ForceNewCluster bool `json:"force-new-cluster"`
Logger string `json:"logger"`
LogOutput string `json:"log-output"`
Debug bool `json:"debug"`
}{ }{
ctls, ctls,
ptls, ptls,
true, true,
"zap",
"io-discard",
false,
} }
b, err := yaml.Marshal(&yc) b, err := yaml.Marshal(&yc)
@ -150,6 +156,9 @@ func mustCreateCfgFile(t *testing.T, b []byte) *os.File {
func TestAutoCompactionModeInvalid(t *testing.T) { func TestAutoCompactionModeInvalid(t *testing.T) {
cfg := NewConfig() cfg := NewConfig()
cfg.Logger = "zap"
cfg.LogOutput = "io-discard"
cfg.Debug = false
cfg.AutoCompactionMode = "period" cfg.AutoCompactionMode = "period"
err := cfg.Validate() err := cfg.Validate()
if err == nil { if err == nil {

5
integration/cluster_test.go
View File

@ -28,8 +28,6 @@ import (
"github.com/coreos/etcd/client" "github.com/coreos/etcd/client"
"github.com/coreos/etcd/etcdserver" "github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/pkg/testutil" "github.com/coreos/etcd/pkg/testutil"
"github.com/coreos/pkg/capnslog"
) )
func init() { func init() {
@ -456,9 +454,6 @@ func TestRejectUnhealthyRemove(t *testing.T) {
func TestRestartRemoved(t *testing.T) { func TestRestartRemoved(t *testing.T) {
defer testutil.AfterTest(t) defer testutil.AfterTest(t)
capnslog.SetGlobalLogLevel(capnslog.INFO)
defer capnslog.SetGlobalLogLevel(defaultLogLevel)
// 1. start single-member cluster // 1. start single-member cluster
c := NewCluster(t, 1) c := NewCluster(t, 1)
for _, m := range c.Members { for _, m := range c.Members {

8
integration/embed_test.go
View File

@ -52,6 +52,10 @@ func TestEmbedEtcd(t *testing.T) {
// setup defaults // setup defaults
for i := range tests { for i := range tests {
tests[i].cfg = *embed.NewConfig() tests[i].cfg = *embed.NewConfig()
tests[i].cfg.Logger = "zap"
tests[i].cfg.LogOutput = "io-discard"
tests[i].cfg.Debug = false
} }
tests[0].cfg.Durl = "abc" tests[0].cfg.Durl = "abc"
@ -175,6 +179,10 @@ func newEmbedURLs(secure bool, n int) (urls []url.URL) {
} }
func setupEmbedCfg(cfg *embed.Config, curls []url.URL, purls []url.URL) { func setupEmbedCfg(cfg *embed.Config, curls []url.URL, purls []url.URL) {
cfg.Logger = "zap"
cfg.LogOutput = "io-discard"
cfg.Debug = false
cfg.ClusterState = "new" cfg.ClusterState = "new"
cfg.LCUrls, cfg.ACUrls = curls, curls cfg.LCUrls, cfg.ACUrls = curls, curls
cfg.LPUrls, cfg.APUrls = purls, purls cfg.LPUrls, cfg.APUrls = purls, purls

1
integration/member_test.go
View File

@ -28,6 +28,7 @@ import (
func TestPauseMember(t *testing.T) { func TestPauseMember(t *testing.T) {
defer testutil.AfterTest(t) defer testutil.AfterTest(t)
c := NewCluster(t, 5) c := NewCluster(t, 5)
c.Launch(t) c.Launch(t)
defer c.Terminate(t) defer c.Terminate(t)