1

diff --git a/errors/errors.go b/errors/errors.go
index 5e4330efd5360f8431876daaf94d667f2e0a4a9e..a5b0e90909c3575ccd8fe43eb00ad317e74d34cb 100644 (file)
--- a/errors/errors.go
+++ b/errors/errors.go
@@ -97,7 +97,7 @@ func ErrorFormat(e error, format ...func(error) string) (s string) {
                        if len(format) > 0 {
                                s += format[0](v)
                        } else {
-                               s += e.Error() + "\n"
+                               s += v.Error() + "\n"
                        }
                }
        } else if len(format) > 0 {

diff --git a/errors/errors_test.go b/errors/errors_test.go
index 83c7a47bea16631ff0485d8bf43bfd1c06ba7682..8abffcafa7f951c7892584034d2b5f1928ef3c0b 100644 (file)
--- a/errors/errors_test.go
+++ b/errors/errors_test.go
@@ -32,12 +32,13 @@ func TestXxx(t *testing.T) {
 
 func Test2(t *testing.T) {
        e := Join(New("r0", "a0"), New("r1", "a1"))
+       t.Log(ErrorFormat(e))
        t.Log(ErrorFormat(e, ErrSimplifyFunc))
        t.Log(ErrorFormat(e, ErrInLineFunc))
-       if ErrorFormat(e, ErrSimplifyFunc) != "r0\nr1\n" {
+       if ErrorFormat(e, ErrSimplifyFunc) != "a0\na1\n" {
                t.FailNow()
        }
-       if ErrorFormat(e, ErrInLineFunc) != " > r0 > r1" {
+       if ErrorFormat(e, ErrInLineFunc) != " > a0 > a1" {
                t.FailNow()
        }
 }