From 4bb4200ca0a798583a1b5e4c5e31b977a5e62149 Mon Sep 17 00:00:00 2001 From: Boris Bliznioukov Date: Wed, 4 Mar 2026 22:13:13 +0100 Subject: [PATCH] refactor(tests): clean up captureStdout function and remove unused fmt import Signed-off-by: Boris Bliznioukov --- pkg/tools/shell_tool_test.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/tools/shell_tool_test.go b/pkg/tools/shell_tool_test.go index 26d23ee83..48e0658d7 100644 --- a/pkg/tools/shell_tool_test.go +++ b/pkg/tools/shell_tool_test.go @@ -3,7 +3,6 @@ package tools import ( "bytes" "context" - "fmt" "os" "strings" "sync" @@ -161,14 +160,20 @@ func captureStdout(t *testing.T, fn func()) string { old := os.Stdout os.Stdout = w + defer func() { + os.Stdout = old + _ = w.Close() + _ = r.Close() + }() fn() - w.Close() - os.Stdout = old + _ = w.Close() var buf bytes.Buffer - buf.ReadFrom(r) + if _, err := buf.ReadFrom(r); err != nil { + t.Fatal(err) + } return buf.String() } @@ -265,6 +270,3 @@ func TestNewExecToolWithConfig_EnableDenyPatternsFalseWarning(t *testing.T) { t.Errorf("expected warning in NewExecToolWithConfig output: %s", out) } } - -// Suppress unused import lint for fmt (used by captureStdout indirectly). -var _ = fmt.Sprintf