error test

Author: linkdata

pkg/errgitexec.go

@@ -1,7 +1,8 @@
 package gitsemver
 
 import (
-	"strconv"
+	"fmt"
+	"strings"
 )
 
 type errGitExec struct {
@@ -23,21 +24,15 @@ func NewErrGitExec(git string, args []string, err error, stderr string) error {
 }
 
 func (err *errGitExec) Error() string {
-	var b []byte
-	if err.git != "" {
-		b = append(b, err.git...)
-		for _, arg := range err.args {
-			b = append(b, ' ')
-			b = strconv.AppendQuote(b, arg)
-		}
-		b = append(b, ": "...)
+	var sb strings.Builder
+	fmt.Fprintf(&sb, "%q:", strings.Join(append([]string{err.git}, err.args...), " "))
+	if err.err != nil {
+		fmt.Fprintf(&sb, " %v", err.err)
 	}
 	if len(err.stderr) > 0 {
-		b = append(b, err.stderr...)
-	} else if err.err != nil {
-		b = append(b, err.err.Error()...)
+		fmt.Fprintf(&sb, " %q", err.stderr)
 	}
-	return string(b)
+	return sb.String()
 }
 
 func (err *errGitExec) Is(other error) bool {

pkg/errgitexec_test.go

@@ -15,21 +15,13 @@ func Test_errGitExec_Error(t *testing.T) {
 		stderr string
 		want   string
 	}{
-		{
-			name:   "nil",
-			git:    "",
-			args:   nil,
-			err:    nil,
-			stderr: "",
-			want:   "",
-		},
 		{
 			name:   "os.ErrNotExist",
 			git:    "_nope_",
-			args:   nil,
+			args:   []string{"a"},
 			err:    os.ErrNotExist,
-			stderr: "",
-			want:   "_nope_: " + os.ErrNotExist.Error(),
+			stderr: "meh",
+			want:   "\"_nope_ a\": " + os.ErrNotExist.Error() + " \"meh\"",
 		},
 	}
 	for _, tt := range tests {

pkg/gitter.go

@@ -69,10 +69,14 @@ func (dg DefaultGitter) Exec(args ...string) (output []byte, err error) {
 		MaybeSync(dg.DebugOut)
 		defer func(w io.Writer) {
 			result := "OK"
+			for errors.Unwrap(err) != nil {
+				err = errors.Unwrap(err)
+			}
 			if err != nil {
 				result = err.Error()
-			} else if serr.Len() > 0 {
-				result = serr.String()
+			}
+			if serr.Len() > 0 {
+				result += fmt.Sprintf(" %q", serr.String())
 			}
 			fmt.Fprintf(w, " (%v+%v) %v\n", sout.Len(), serr.Len(), result)
 			MaybeSync(w)