From df5dce753523e0e1eca7de91d272ff16c9c0d79c Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:48:14 -0500 Subject: Change Error in console outputter to accept error --- internal/output/console.go | 7 +++++++ internal/output/console_test.go | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'internal/output') diff --git a/internal/output/console.go b/internal/output/console.go index 7f04b28..42b0e3f 100644 --- a/internal/output/console.go +++ b/internal/output/console.go @@ -24,12 +24,19 @@ func (c ConsoleOutputter) Output(message string) error { return nil } +<<<<<<< Updated upstream func (c ConsoleOutputter) Error(message string) error { _, err := fmt.Fprintln(c.stderr, message) if err != nil { return fmt.Errorf("unable to print message %s: %w", message, err) } return nil +======= +func (c ConsoleOutputter) Error(err error) error { + msg := err.Error() + _, printErr := fmt.Fprintln(c.stderr, msg) + return fmt.Errorf("unable to print message %s: %w", msg, printErr) +>>>>>>> Stashed changes } func (c ConsoleOutputter) Table(headers []string, rows [][]string) error { diff --git a/internal/output/console_test.go b/internal/output/console_test.go index 78e5d38..492d0a2 100644 --- a/internal/output/console_test.go +++ b/internal/output/console_test.go @@ -2,6 +2,7 @@ package output import ( "bytes" + "errors" "io" "testing" @@ -28,7 +29,7 @@ func TestConsoleOutputter_Error(t *testing.T) { var stderr bytes.Buffer consoleOutputter := NewConsoleOutputterWithWriters(&stdout, &stderr) - consoleOutputter.Error("test string") + consoleOutputter.Error(errors.New("test string")) check.Equal(t, stdout.String(), "") check.Equal(t, stderr.String(), "test string\n") -- cgit v1.2.3