also trim trailing newlines

Signed-off-by: Jason Hall <[email protected]>

slogtest/slogtest.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"io"
 	"log/slog"
+	"strings"
 
 	"github.com/chainguard-dev/clog"
 )
@@ -17,20 +18,18 @@ type logAdapter struct {
 }
 
 func (l *logAdapter) Write(b []byte) (int, error) {
-	l.l.Helper()
-	l.l.Log(string(b))
+	l.l.Log(strings.TrimSuffix(string(b), "\n"))
 	return len(b), nil
 }
 
 type Logger interface {
-	Helper()
 	Log(args ...any)
 	Logf(format string, args ...any)
 }
 
 // TestLogger gets a logger to use in unit and end to end tests
 func TestLogger(t Logger) *clog.Logger {
-	return clog.New(slog.NewTextHandler(&logAdapter{l: t}, &slog.HandlerOptions{}))
+	return clog.New(slog.NewTextHandler(&logAdapter{l: t}, nil))
 }
 
 // TestContextWithLogger returns a context with a logger to be used in tests

slogtest/slogtest_test.go

@@ -10,4 +10,6 @@ func TestSlogTest(t *testing.T) {
 	ctx := TestContextWithLogger(t)
 
 	clog.FromContext(ctx).With("foo", "bar").Infof("hello world")
+	clog.FromContext(ctx).With("bar", "baz").Infof("me again")
+	clog.FromContext(ctx).With("baz", true).Infof("okay last one")
 }