Fixes for failing tests

Signed-off-by: Kimmo Lehto <[email protected]>

aliases_test.go

@@ -160,7 +160,6 @@ func TestGetOSRelease(t *testing.T) {
 			return nil
 		})
 
-		t.Log("getting release")
 		os, err := rig.GetOSRelease(mr)
 		require.NoError(t, err)
 		require.Equal(t, "Foo", os.Name)

kv/decoder.go

@@ -409,7 +409,10 @@ func (d *Decoder) Decode(obj any) (err error) { //nolint:cyclop
 	reader := bufio.NewReader(d.r)
 	for {
 		line, readErr := reader.ReadString(d.rdelim)
-		if readErr != nil && !errors.Is(readErr, io.EOF) {
+		if line == "" && readErr != nil {
+			if errors.Is(readErr, io.EOF) {
+				return nil
+			}
 			return fmt.Errorf("read: %w", readErr)
 		}
 
@@ -433,8 +436,14 @@ func (d *Decoder) Decode(obj any) (err error) { //nolint:cyclop
 			}
 		}
 
-		if errors.Is(readErr, io.EOF) {
-			return nil
+		// TODO Something somewhere returns non-empty string and io.EOF in the same call
+		// so the error has to be handled twice per loop. It may be a bug in the ExecScanner
+		// implementation or in the mock runner.
+		if readErr != nil {
+			if errors.Is(readErr, io.EOF) {
+				return nil
+			}
+			return fmt.Errorf("read: %w", readErr)
 		}
 	}
 }

rigtest/mocklogger.go

@@ -18,6 +18,18 @@ func TraceToStderr() {
 	log.SetTraceLogger(slog.New(slog.NewTextHandler(os.Stderr, nil)))
 }
 
+// TraceOff sets the trace logger to null.
+func TraceOff() {
+	log.SetTraceLogger(log.Null)
+}
+
+// Trace allows running a function with trace logging enabled.
+func Trace(fn func()) {
+	TraceToStderr()
+	fn()
+	defer TraceOff()
+}
+
 // MockLogMessage is a mock log message.
 type MockLogMessage struct {
 	level         int