enable log again

mongodb · Aug 8, 2023 · 2649b9f · 2649b9f
1 parent 197bb13
commit 2649b9f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/test/e2e/encryption_at_rest_test.go b/test/e2e/encryption_at_rest_test.go
@@ -43,7 +43,7 @@ const (
 	KeyName           = "encryption-at-rest-test-key"
 )
 
-var _ = Describe("Encryption at REST test", Label("encryption-at-rest"), func() {
+var _ = FDescribe("Encryption at REST test", Label("encryption-at-rest"), func() {
 	var testData *model.TestDataProvider
 
 	_ = BeforeEach(func() {

diff --git a/test/e2e/k8s/operator.go b/test/e2e/k8s/operator.go
@@ -1,13 +1,15 @@
 package k8s
 
 import (
-	"errors"
 	"fmt"
 	"os"
-	"path"
 	"strings"
 	"time"
 
+	"go.uber.org/zap/zaptest"
+
+	. "github.com/onsi/ginkgo/v2"
+
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
@@ -46,7 +48,13 @@ func RunOperator(initCfg *Config) (manager.Manager, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to create log directory: %w", err)
 	}
-	logger, err := initCustomZapLogger(config.LogLevel, config.LogEncoder, path.Join(config.LogDir, "operator.log"))
+	//logger, err := initCustomZapLogger(config.LogLevel, config.LogEncoder, path.Join(config.LogDir, "operator.log"))
+	logger := zaptest.NewLogger(
+		GinkgoT(),
+		zaptest.WrapOptions(
+			zap.ErrorOutput(zapcore.Lock(zapcore.AddSync(GinkgoWriter))),
+		),
+	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize custom zap logger: %w", err)
 	}
@@ -205,6 +213,7 @@ func mergeConfiguration(initCfg *Config) *Config {
 	return config
 }
 
+/*
 func initCustomZapLogger(level, encoding, logFileName string) (*zap.Logger, error) {
 	lv := zap.AtomicLevel{}
 	err := lv.UnmarshalText([]byte(strings.ToLower(level)))
@@ -233,3 +242,4 @@ func initCustomZapLogger(level, encoding, logFileName string) (*zap.Logger, erro
 	}
 	return cfg.Build()
 }
+*/