From 992ee7c68d888c83400a9ff110af207d69876bc5 Mon Sep 17 00:00:00 2001 From: AdamMagued Date: Wed, 14 Oct 2026 01:27:50 +0300 Subject: [PATCH] fix(tests): modernize test assertions for recent Go toolchains --- format_test.go | 60 +++++++++++++++++++++++++------------------------- json_test.go | 4 ++-- stack_test.go | 28 +++++++++++------------ 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/format_test.go b/format_test.go index cb1df821..c4c3487e 100644 --- a/format_test.go +++ b/format_test.go @@ -27,7 +27,7 @@ func TestFormatNew(t *testing.T) { "%+v", "error\n" + "github.com/pkg/errors.TestFormatNew\n" + - "\t.+/github.com/pkg/errors/format_test.go:26", + "\t.+/format_test.go:26", }, { New("error"), "%q", @@ -57,7 +57,7 @@ func TestFormatErrorf(t *testing.T) { "%+v", "error\n" + "github.com/pkg/errors.TestFormatErrorf\n" + - "\t.+/github.com/pkg/errors/format_test.go:56", + "\t.+/format_test.go:56", }} for i, tt := range tests { @@ -83,7 +83,7 @@ func TestFormatWrap(t *testing.T) { "%+v", "error\n" + "github.com/pkg/errors.TestFormatWrap\n" + - "\t.+/github.com/pkg/errors/format_test.go:82", + "\t.+/format_test.go:82", }, { Wrap(io.EOF, "error"), "%s", @@ -98,14 +98,14 @@ func TestFormatWrap(t *testing.T) { "EOF\n" + "error\n" + "github.com/pkg/errors.TestFormatWrap\n" + - "\t.+/github.com/pkg/errors/format_test.go:96", + "\t.+/format_test.go:96", }, { Wrap(Wrap(io.EOF, "error1"), "error2"), "%+v", "EOF\n" + "error1\n" + "github.com/pkg/errors.TestFormatWrap\n" + - "\t.+/github.com/pkg/errors/format_test.go:103\n", + "\t.+/format_test.go:103\n", }, { Wrap(New("error with space"), "context"), "%q", @@ -136,7 +136,7 @@ func TestFormatWrapf(t *testing.T) { "EOF\n" + "error2\n" + "github.com/pkg/errors.TestFormatWrapf\n" + - "\t.+/github.com/pkg/errors/format_test.go:134", + "\t.+/format_test.go:134", }, { Wrapf(New("error"), "error%d", 2), "%s", @@ -150,7 +150,7 @@ func TestFormatWrapf(t *testing.T) { "%+v", "error\n" + "github.com/pkg/errors.TestFormatWrapf\n" + - "\t.+/github.com/pkg/errors/format_test.go:149", + "\t.+/format_test.go:149", }} for i, tt := range tests { @@ -176,7 +176,7 @@ func TestFormatWithStack(t *testing.T) { "%+v", []string{"EOF", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:175"}, + "\t.+/format_test.go:175"}, }, { WithStack(New("error")), "%s", @@ -190,36 +190,36 @@ func TestFormatWithStack(t *testing.T) { "%+v", []string{"error", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:189", + "\t.+/format_test.go:189", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:189"}, + "\t.+/format_test.go:189"}, }, { WithStack(WithStack(io.EOF)), "%+v", []string{"EOF", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:197", + "\t.+/format_test.go:197", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:197"}, + "\t.+/format_test.go:197"}, }, { WithStack(WithStack(Wrapf(io.EOF, "message"))), "%+v", []string{"EOF", "message", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:205", + "\t.+/format_test.go:205", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:205", + "\t.+/format_test.go:205", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:205"}, + "\t.+/format_test.go:205"}, }, { WithStack(Errorf("error%d", 1)), "%+v", []string{"error1", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:216", + "\t.+/format_test.go:216", "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:216"}, + "\t.+/format_test.go:216"}, }} for i, tt := range tests { @@ -246,7 +246,7 @@ func TestFormatWithMessage(t *testing.T) { []string{ "error", "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:244", + "\t.+/format_test.go:244", "error2"}, }, { WithMessage(io.EOF, "addition1"), @@ -273,13 +273,13 @@ func TestFormatWithMessage(t *testing.T) { "%+v", []string{"EOF", "error1", "error2", "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:272"}, + "\t.+/format_test.go:272"}, }, { WithMessage(Errorf("error%d", 1), "error2"), "%+v", []string{"error1", "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:278", + "\t.+/format_test.go:278", "error2"}, }, { WithMessage(WithStack(io.EOF), "error"), @@ -287,7 +287,7 @@ func TestFormatWithMessage(t *testing.T) { []string{ "EOF", "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:285", + "\t.+/format_test.go:285", "error"}, }, { WithMessage(Wrap(WithStack(io.EOF), "inside-error"), "outside-error"), @@ -295,10 +295,10 @@ func TestFormatWithMessage(t *testing.T) { []string{ "EOF", "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:293", + "\t.+/format_test.go:293", "inside-error", "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:293", + "\t.+/format_test.go:293", "outside-error"}, }} @@ -315,11 +315,11 @@ func TestFormatGeneric(t *testing.T) { {New("new-error"), []string{ "new-error", "github.com/pkg/errors.TestFormatGeneric\n" + - "\t.+/github.com/pkg/errors/format_test.go:315"}, + "\t.+/format_test.go:315"}, }, {Errorf("errorf-error"), []string{ "errorf-error", "github.com/pkg/errors.TestFormatGeneric\n" + - "\t.+/github.com/pkg/errors/format_test.go:319"}, + "\t.+/format_test.go:319"}, }, {errors.New("errors-new-error"), []string{ "errors-new-error"}, }, @@ -333,21 +333,21 @@ func TestFormatGeneric(t *testing.T) { func(err error) error { return WithStack(err) }, []string{ "github.com/pkg/errors.(func·002|TestFormatGeneric.func2)\n\t" + - ".+/github.com/pkg/errors/format_test.go:333", + ".+/format_test.go:333", }, }, { func(err error) error { return Wrap(err, "wrap-error") }, []string{ "wrap-error", "github.com/pkg/errors.(func·003|TestFormatGeneric.func3)\n\t" + - ".+/github.com/pkg/errors/format_test.go:339", + ".+/format_test.go:339", }, }, { func(err error) error { return Wrapf(err, "wrapf-error%d", 1) }, []string{ "wrapf-error1", "github.com/pkg/errors.(func·004|TestFormatGeneric.func4)\n\t" + - ".+/github.com/pkg/errors/format_test.go:346", + ".+/format_test.go:346", }, }, } @@ -374,9 +374,9 @@ func TestFormatWrappedNew(t *testing.T) { "%+v", "error\n" + "github.com/pkg/errors.wrappedNew\n" + - "\t.+/github.com/pkg/errors/format_test.go:364\n" + + "\t.+/format_test.go:364\n" + "github.com/pkg/errors.TestFormatWrappedNew\n" + - "\t.+/github.com/pkg/errors/format_test.go:373", + "\t.+/format_test.go:373", }} for i, tt := range tests { diff --git a/json_test.go b/json_test.go index ad1adec9..dfdc2cfb 100644 --- a/json_test.go +++ b/json_test.go @@ -12,7 +12,7 @@ func TestFrameMarshalText(t *testing.T) { want string }{{ initpc, - `^github.com/pkg/errors\.init(\.ializers)? .+/github\.com/pkg/errors/stack_test.go:\d+$`, + `^github.com/pkg/errors\.init(\.ializers)? .+/stack_test.go:\d+$`, }, { 0, `^unknown$`, @@ -34,7 +34,7 @@ func TestFrameMarshalJSON(t *testing.T) { want string }{{ initpc, - `^"github\.com/pkg/errors\.init(\.ializers)? .+/github\.com/pkg/errors/stack_test.go:\d+"$`, + `^"github\.com/pkg/errors\.init(\.ializers)? .+/stack_test.go:\d+"$`, }, { 0, `^"unknown"$`, diff --git a/stack_test.go b/stack_test.go index aa10a72e..af8d9da0 100644 --- a/stack_test.go +++ b/stack_test.go @@ -33,7 +33,7 @@ func TestFrameFormat(t *testing.T) { initpc, "%+s", "github.com/pkg/errors.init\n" + - "\t.+/github.com/pkg/errors/stack_test.go", + "\t.+/stack_test.go", }, { 0, "%s", @@ -80,7 +80,7 @@ func TestFrameFormat(t *testing.T) { initpc, "%+v", "github.com/pkg/errors.init\n" + - "\t.+/github.com/pkg/errors/stack_test.go:9", + "\t.+/stack_test.go:9", }, { 0, "%v", @@ -120,24 +120,24 @@ func TestStackTrace(t *testing.T) { }{{ New("ooh"), []string{ "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:121", + "\t.+/stack_test.go:121", }, }, { Wrap(New("ooh"), "ahh"), []string{ "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:126", // this is the stack of Wrap, not New + "\t.+/stack_test.go:126", // this is the stack of Wrap, not New }, }, { Cause(Wrap(New("ooh"), "ahh")), []string{ "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:131", // this is the stack of New + "\t.+/stack_test.go:131", // this is the stack of New }, }, { func() error { return New("ooh") }(), []string{ `github.com/pkg/errors.TestStackTrace.func1` + - "\n\t.+/github.com/pkg/errors/stack_test.go:136", // this is the stack of New + "\n\t.+/stack_test.go:136", // this is the stack of New "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:136", // this is the stack of New's caller + "\t.+/stack_test.go:136", // this is the stack of New's caller }, }, { Cause(func() error { @@ -145,12 +145,12 @@ func TestStackTrace(t *testing.T) { return Errorf("hello %s", fmt.Sprintf("world: %s", "ooh")) }() }()), []string{ - `github.com/pkg/errors.TestStackTrace.func2.1` + - "\n\t.+/github.com/pkg/errors/stack_test.go:145", // this is the stack of Errorf - `github.com/pkg/errors.TestStackTrace.func2` + - "\n\t.+/github.com/pkg/errors/stack_test.go:146", // this is the stack of Errorf's caller + `github.com/pkg/errors.TestStackTrace(.TestStackTrace)?.func2(.1|.func3)` + + "\n\t.+/stack_test.go:145", // this is the stack of Errorf + `github.com/pkg/errors.TestStackTrace(.TestStackTrace)?.func2` + + "\n\t.+/stack_test.go:146", // this is the stack of Errorf's caller "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:147", // this is the stack of Errorf's caller's caller + "\t.+/stack_test.go:147", // this is the stack of Errorf's caller's caller }, }} for i, tt := range tests { @@ -226,9 +226,9 @@ func TestStackTraceFormat(t *testing.T) { "%+v", "\n" + "github.com/pkg/errors.stackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:174\n" + + "\t.+/stack_test.go:174\n" + "github.com/pkg/errors.TestStackTraceFormat\n" + - "\t.+/github.com/pkg/errors/stack_test.go:225", + "\t.+/stack_test.go:225", }, { stackTrace()[:2], "%#v",