Merge pull request #2184 from hashicorp/tmessi-reduce-test-output-noise

This introduces two changes to reduce the output of tests in CI and for
local developers:

- Silences gorm db logs
- Silences log indicating the lack of an eventer
This commit is contained in:
Timothy Messier authored and GitHub committed 2022-06-21 10:51:04 -04:00
commit 5c83182cc7
2 files changed
+26 -3

No files matched your search

+15 -1
View File
@@ -5,6 +5,7 @@ import (
"crypto/rand"
"encoding/base64"
"fmt"
"os"
"strings"
"testing"
"time"
@@ -65,7 +66,20 @@ func TestSetup(t testing.TB, dialect string, opt ...TestOption) (*DB, string) {
case opts.withLogLevel != DefaultTestLogLevel:
db.wrapped.LogLevel(dbw.LogLevel(opts.withLogLevel))
default:
db.wrapped.LogLevel(dbw.Error)
var defaultLevel dbw.LogLevel
switch strings.ToLower(os.Getenv("DEFAULT_TEST_LOG_LEVEL")) {
case "silent":
defaultLevel = dbw.Silent
case "error":
defaultLevel = dbw.Error
case "warn":
defaultLevel = dbw.Warn
case "info":
defaultLevel = dbw.Info
default:
defaultLevel = dbw.Silent
}
db.wrapped.LogLevel(defaultLevel)
}
t.Cleanup(func() {
sqlDB, err := db.SqlDB(ctx)
+11 -2
View File
@@ -3,12 +3,15 @@ package event
import (
"context"
"fmt"
"os"
"runtime"
"time"
"github.com/hashicorp/go-hclog"
)
var ci bool
type key int
const cancelledSendTimeout = 3 * time.Second
@@ -18,6 +21,10 @@ const (
requestInfoKey
)
func init() {
ci = os.Getenv("CI") != ""
}
// NewEventerContext will return a context containing a value of the provided Eventer
func NewEventerContext(ctx context.Context, eventer *Eventer) (context.Context, error) {
const op = "event.NewEventerContext"
@@ -128,8 +135,10 @@ func WriteError(ctx context.Context, caller Op, e error, opt ...Option) {
if !ok {
eventer = SysEventer()
if eventer == nil {
logger := hclog.New(nil)
logger.Error(fmt.Sprintf("%s: no eventer available to write error: %v", op, e))
if !ci {
logger := hclog.New(nil)
logger.Error(fmt.Sprintf("%s: no eventer available to write error: %v", op, e))
}
return
}
}