From: =?utf-8?b?T3R0byBLZWvDpGzDpGluZW4=?= Date: Fri, 22 Aug 2025 21:23:07 +0000 Subject: Fix: Adjust Go test expectations for Debian packaging The upstream test suite for `golang-github-pingcap-errors` fails during Debian package build due to discrepancies in expected output. The tests contain hardcoded package paths and line numbers that do not match the Debian build environment. Align the expected test output with the actual build environment. - The expected package import path from `github.com/pkg/errors` to `github.com/pingcap/errors`. - Hardcoded line numbers in stack traces to reflect the actual line numbers in the source files within the Debian build path. Fixes errors: === RUN TestFormatNew format_test.go:38: test 3: line 2: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatNew\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:26\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "error\ngithub.com/pkg/errors.TestFormatNew\n\t.+/github.com/pkg/errors/format_test.go:26" format_test.go:38: test 3: line 3: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatNew\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:26\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "error\ngithub.com/pkg/errors.TestFormatNew\n\t.+/github.com/pkg/errors/format_test.go:26" --- FAIL: TestFormatNew (0.00s) === RUN TestFormatErrorf format_test.go:64: test 3: line 2: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatErrorf\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:56\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "error\ngithub.com/pkg/errors.TestFormatErrorf\n\t.+/github.com/pkg/errors/format_test.go:56" format_test.go:64: test 3: line 3: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatErrorf\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:56\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "error\ngithub.com/pkg/errors.TestFormatErrorf\n\t.+/github.com/pkg/errors/format_test.go:56" --- FAIL: TestFormatErrorf (0.00s) === RUN TestFormatWrap format_test.go:116: test 3: line 2: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatWrap\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:82\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700\nerror2" want: "error\ngithub.com/pkg/errors.TestFormatWrap\n\t.+/github.com/pkg/errors/format_test.go:82" format_test.go:116: test 3: line 3: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatWrap\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:82\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700\nerror2" want: "error\ngithub.com/pkg/errors.TestFormatWrap\n\t.+/github.com/pkg/errors/format_test.go:82" format_test.go:116: test 6: line 3: fmt.Sprintf("%+v", err): got: "EOF\nerror\ngithub.com/pingcap/errors.TestFormatWrap\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:96\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "EOF\nerror\ngithub.com/pkg/errors.TestFormatWrap\n\t.+/github.com/pkg/errors/format_test.go:96" format_test.go:116: test 6: line 4: fmt.Sprintf("%+v", err): got: "EOF\nerror\ngithub.com/pingcap/errors.TestFormatWrap\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:96\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "EOF\nerror\ngithub.com/pkg/errors.TestFormatWrap\n\t.+/github.com/pkg/errors/format_test.go:96" format_test.go:116: test 7: line 3: fmt.Sprintf("%+v", err): got: "EOF\nerror1\ngithub.com/pingcap/errors.TestFormatWrap\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:103\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700\nerror2" want: "EOF\nerror1\ngithub.com/pkg/errors.TestFormatWrap\n\t.+/github.com/pkg/errors/format_test.go:103\n" format_test.go:116: test 7: line 4: fmt.Sprintf("%+v", err): got: "EOF\nerror1\ngithub.com/pingcap/errors.TestFormatWrap\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:103\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700\nerror2" want: "EOF\nerror1\ngithub.com/pkg/errors.TestFormatWrap\n\t.+/github.com/pkg/errors/format_test.go:103\n" --- FAIL: TestFormatWrap (0.00s) === RUN TestFormatWrapf format_test.go:157: test 3: line 3: fmt.Sprintf("%+v", err): got: "EOF\nerror2\ngithub.com/pingcap/errors.TestFormatWrapf\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:134\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "EOF\nerror2\ngithub.com/pkg/errors.TestFormatWrapf\n\t.+/github.com/pkg/errors/format_test.go:134" format_test.go:157: test 3: line 4: fmt.Sprintf("%+v", err): got: "EOF\nerror2\ngithub.com/pingcap/errors.TestFormatWrapf\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:134\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "EOF\nerror2\ngithub.com/pkg/errors.TestFormatWrapf\n\t.+/github.com/pkg/errors/format_test.go:134" format_test.go:157: test 6: line 2: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatWrapf\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:149\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700\nerror2" want: "error\ngithub.com/pkg/errors.TestFormatWrapf\n\t.+/github.com/pkg/errors/format_test.go:149" format_test.go:157: test 6: line 3: fmt.Sprintf("%+v", err): got: "error\ngithub.com/pingcap/errors.TestFormatWrapf\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:149\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700\nerror2" want: "error\ngithub.com/pkg/errors.TestFormatWrapf\n\t.+/github.com/pkg/errors/format_test.go:149" --- FAIL: TestFormatWrapf (0.00s) === RUN TestFormatWithStack format_test.go:476: test 3: block 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestFormatWithStack\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:175\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "github.com/pkg/errors.TestFormatWithStack\n\t.+/github.com/pkg/errors/format_test.go:175" all-got: EOF github.com/pingcap/errors.TestFormatWithStack /tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:175 testing.tRunner /usr/lib/go-1.24/src/testing/testing.go:1792 runtime.goexit /usr/lib/go-1.24/src/runtime/asm_amd64.s:1700 all-want: EOF github.com/pkg/errors.TestFormatWithStack .+/github.com/pkg/errors/format_test.go:175 --- FAIL: TestFormatWithStack (0.00s) === RUN TestFormatWithMessage format_test.go:476: test 3: block 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestFormatWithMessage\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:244\ntesting.tRunner\n\t/usr/lib/go-1.24/src/testing/testing.go:1792\nruntime.goexit\n\t/usr/lib/go-1.24/src/runtime/asm_amd64.s:1700" want: "github.com/pkg/errors.TestFormatWithMessage\n\t.+/github.com/pkg/errors/format_test.go:244" all-got: error github.com/pingcap/errors.TestFormatWithMessage /tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/format_test.go:244 testing.tRunner /usr/lib/go-1.24/src/testing/testing.go:1792 runtime.goexit /usr/lib/go-1.24/src/runtime/asm_amd64.s:1700 error2 all-want: error github.com/pkg/errors.TestFormatWithMessage .+/github.com/pkg/errors/format_test.go:244 error2 --- FAIL: TestFormatWithMessage (0.00s) === RUN TestFrameLine stack_test.go:40: Frame(5391400): want: 9, got: 10 stack_test.go:40: Frame(5433864): want: 20, got: 21 stack_test.go:40: Frame(5433947): want: 28, got: 24 --- FAIL: TestFrameLine (0.00s) === RUN TestFrameFormat stack_test.go:125: test 2: line 1: fmt.Sprintf("%+s", err): got: "github.com/pingcap/errors.init\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go" want: "github.com/pkg/errors.init\n\t.+/github.com/pkg/errors/stack_test.go" stack_test.go:125: test 2: line 2: fmt.Sprintf("%+s", err): got: "github.com/pingcap/errors.init\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go" want: "github.com/pkg/errors.init\n\t.+/github.com/pkg/errors/stack_test.go" stack_test.go:125: test 5: line 1: fmt.Sprintf("%d", err): got: "10" want: "9" stack_test.go:125: test 11: line 1: fmt.Sprintf("%v", err): got: "stack_test.go:10" want: "stack_test.go:9" stack_test.go:125: test 12: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.init\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:10" want: "github.com/pkg/errors.init\n\t.+/github.com/pkg/errors/stack_test.go:9" stack_test.go:125: test 12: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.init\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:10" want: "github.com/pkg/errors.init\n\t.+/github.com/pkg/errors/stack_test.go:9" --- FAIL: TestFrameFormat (0.00s) === RUN TestFuncname --- PASS: TestFuncname (0.00s) === RUN TestStackTrace stack_test.go:203: test 1: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:155" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:154" stack_test.go:203: test 1: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:155" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:154" stack_test.go:203: test 2: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:160" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:159" stack_test.go:203: test 2: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:160" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:159" stack_test.go:203: test 3: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:165" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:164" stack_test.go:203: test 3: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:165" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:164" stack_test.go:203: test 4: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace.func1\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:170" want: "github.com/pkg/errors.(func·009|TestStackTrace.func1)\n\t.+/github.com/pkg/errors/stack_test.go:169" stack_test.go:203: test 4: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace.func1\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:170" want: "github.com/pkg/errors.(func·009|TestStackTrace.func1)\n\t.+/github.com/pkg/errors/stack_test.go:169" stack_test.go:203: test 4: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:170" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:169" stack_test.go:203: test 4: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:170" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:169" stack_test.go:203: test 5: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace.TestStackTrace.func2.func3\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:179" want: "github.com/pkg/errors.(func·010|TestStackTrace.func2.1)\n\t.+/github.com/pkg/errors/stack_test.go:178" stack_test.go:203: test 5: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace.TestStackTrace.func2.func3\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:179" want: "github.com/pkg/errors.(func·010|TestStackTrace.func2.1)\n\t.+/github.com/pkg/errors/stack_test.go:178" stack_test.go:203: test 5: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace.func2\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:180" want: "github.com/pkg/errors.(func·011|TestStackTrace.func2)\n\t.+/github.com/pkg/errors/stack_test.go:179" stack_test.go:203: test 5: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace.func2\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:180" want: "github.com/pkg/errors.(func·011|TestStackTrace.func2)\n\t.+/github.com/pkg/errors/stack_test.go:179" stack_test.go:203: test 5: line 1: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:181" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:180" stack_test.go:203: test 5: line 2: fmt.Sprintf("%+v", err): got: "github.com/pingcap/errors.TestStackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:181" want: "github.com/pkg/errors.TestStackTrace\n\t.+/github.com/pkg/errors/stack_test.go:180" --- FAIL: TestStackTrace (0.00s) === RUN TestStackTraceFormat stack_test.go:276: test 11: line 2: fmt.Sprintf("%+v", err): got: "\ngithub.com/pingcap/errors.stackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:211\ngithub.com/pingcap/errors.TestStackTraceFormat\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:262" want: "\ngithub.com/pkg/errors.stackTrace\n\t.+/github.com/pkg/errors/stack_test.go:210\ngithub.com/pkg/errors.TestStackTraceFormat\n\t.+/github.com/pkg/errors/stack_test.go:261" stack_test.go:276: test 11: line 3: fmt.Sprintf("%+v", err): got: "\ngithub.com/pingcap/errors.stackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:211\ngithub.com/pingcap/errors.TestStackTraceFormat\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:262" want: "\ngithub.com/pkg/errors.stackTrace\n\t.+/github.com/pkg/errors/stack_test.go:210\ngithub.com/pkg/errors.TestStackTraceFormat\n\t.+/github.com/pkg/errors/stack_test.go:261" stack_test.go:276: test 11: line 4: fmt.Sprintf("%+v", err): got: "\ngithub.com/pingcap/errors.stackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:211\ngithub.com/pingcap/errors.TestStackTraceFormat\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:262" want: "\ngithub.com/pkg/errors.stackTrace\n\t.+/github.com/pkg/errors/stack_test.go:210\ngithub.com/pkg/errors.TestStackTraceFormat\n\t.+/github.com/pkg/errors/stack_test.go:261" stack_test.go:276: test 11: line 5: fmt.Sprintf("%+v", err): got: "\ngithub.com/pingcap/errors.stackTrace\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:211\ngithub.com/pingcap/errors.TestStackTraceFormat\n\t/tmp/build/source/debian/.build/upstream/src/github.com/pingcap/errors/stack_test.go:262" want: "\ngithub.com/pkg/errors.stackTrace\n\t.+/github.com/pkg/errors/stack_test.go:210\ngithub.com/pkg/errors.TestStackTraceFormat\n\t.+/github.com/pkg/errors/stack_test.go:261" stack_test.go:276: test 12: line 1: fmt.Sprintf("%#v", err): got: "[]errors.Frame{stack_test.go:211, stack_test.go:270}" want: "\\[\\]errors.Frame{stack_test.go:210, stack_test.go:269}" --- FAIL: TestStackTraceFormat (0.00s) --- format_test.go | 88 +++++++++++++++++++++++++++++----------------------------- stack_test.go | 60 +++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/format_test.go b/format_test.go index 30275a3..5a33b20 100644 --- a/format_test.go +++ b/format_test.go @@ -26,8 +26,8 @@ func TestFormatNew(t *testing.T) { New("error"), "%+v", "error\n" + - "github.com/pkg/errors.TestFormatNew\n" + - "\t.+/github.com/pkg/errors/format_test.go:26", + "github.com/pingcap/errors.TestFormatNew\n" + + "\t.+/github.com/pingcap/errors/format_test.go:26", }, { New("error"), "%q", @@ -56,8 +56,8 @@ func TestFormatErrorf(t *testing.T) { Errorf("%s", "error"), "%+v", "error\n" + - "github.com/pkg/errors.TestFormatErrorf\n" + - "\t.+/github.com/pkg/errors/format_test.go:56", + "github.com/pingcap/errors.TestFormatErrorf\n" + + "\t.+/github.com/pingcap/errors/format_test.go:56", }} for i, tt := range tests { @@ -82,8 +82,8 @@ func TestFormatWrap(t *testing.T) { Annotate(New("error"), "error2"), "%+v", "error\n" + - "github.com/pkg/errors.TestFormatWrap\n" + - "\t.+/github.com/pkg/errors/format_test.go:82", + "github.com/pingcap/errors.TestFormatWrap\n" + + "\t.+/github.com/pingcap/errors/format_test.go:82", }, { Annotate(io.EOF, "error"), "%s", @@ -97,15 +97,15 @@ func TestFormatWrap(t *testing.T) { "%+v", "EOF\n" + "error\n" + - "github.com/pkg/errors.TestFormatWrap\n" + - "\t.+/github.com/pkg/errors/format_test.go:96", + "github.com/pingcap/errors.TestFormatWrap\n" + + "\t.+/github.com/pingcap/errors/format_test.go:96", }, { Annotate(Annotate(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", + "github.com/pingcap/errors.TestFormatWrap\n" + + "\t.+/github.com/pingcap/errors/format_test.go:103\n", }, { Annotate(New("error with space"), "context"), "%q", @@ -135,8 +135,8 @@ func TestFormatWrapf(t *testing.T) { "%+v", "EOF\n" + "error2\n" + - "github.com/pkg/errors.TestFormatWrapf\n" + - "\t.+/github.com/pkg/errors/format_test.go:134", + "github.com/pingcap/errors.TestFormatWrapf\n" + + "\t.+/github.com/pingcap/errors/format_test.go:134", }, { Annotatef(New("error"), "error%d", 2), "%s", @@ -149,8 +149,8 @@ func TestFormatWrapf(t *testing.T) { Annotatef(New("error"), "error%d", 2), "%+v", "error\n" + - "github.com/pkg/errors.TestFormatWrapf\n" + - "\t.+/github.com/pkg/errors/format_test.go:149", + "github.com/pingcap/errors.TestFormatWrapf\n" + + "\t.+/github.com/pingcap/errors/format_test.go:149", }} for i, tt := range tests { @@ -175,8 +175,8 @@ func TestFormatWithStack(t *testing.T) { WithStack(io.EOF), "%+v", []string{"EOF", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:175"}, + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:175"}, }, { WithStack(New("error")), "%s", @@ -189,37 +189,37 @@ func TestFormatWithStack(t *testing.T) { WithStack(New("error")), "%+v", []string{"error", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:189", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:189"}, + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:189", + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/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", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:197"}, + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:197", + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:197"}, }, { WithStack(WithStack(Annotatef(io.EOF, "message"))), "%+v", []string{"EOF", "message", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:205", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:205", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:205"}, + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:205", + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:205", + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/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", - "github.com/pkg/errors.TestFormatWithStack\n" + - "\t.+/github.com/pkg/errors/format_test.go:216"}, + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:216", + "github.com/pingcap/errors.TestFormatWithStack\n" + + "\t.+/github.com/pingcap/errors/format_test.go:216"}, }} for i, tt := range tests { @@ -245,8 +245,8 @@ func TestFormatWithMessage(t *testing.T) { "%+v", []string{ "error", - "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:244", + "github.com/pingcap/errors.TestFormatWithMessage\n" + + "\t.+/github.com/pingcap/errors/format_test.go:244", "error2"}, }, { WithMessage(io.EOF, "addition1"), @@ -272,30 +272,30 @@ func TestFormatWithMessage(t *testing.T) { Annotate(WithMessage(io.EOF, "error1"), "error2"), "%+v", []string{"EOF", "error1", "error2", - "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:272"}, + "github.com/pingcap/errors.TestFormatWithMessage\n" + + "\t.+/github.com/pingcap/errors/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", + "github.com/pingcap/errors.TestFormatWithMessage\n" + + "\t.+/github.com/pingcap/errors/format_test.go:278", "error2"}, }, { WithMessage(WithStack(io.EOF), "error"), "%+v", []string{ "EOF", - "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:285", + "github.com/pingcap/errors.TestFormatWithMessage\n" + + "\t.+/github.com/pingcap/errors/format_test.go:285", "error"}, }, { WithMessage(Annotate(WithStack(io.EOF), "inside-error"), "outside-error"), "%+v", []string{ "EOF", - "github.com/pkg/errors.TestFormatWithMessage\n" + - "\t.+/github.com/pkg/errors/format_test.go:293", + "github.com/pingcap/errors.TestFormatWithMessage\n" + + "\t.+/github.com/pingcap/errors/format_test.go:293", "inside-error", "outside-error"}, }} diff --git a/stack_test.go b/stack_test.go index 7ef28fe..9e47ae5 100644 --- a/stack_test.go +++ b/stack_test.go @@ -15,19 +15,19 @@ func TestFrameLine(t *testing.T) { want int }{{ Frame(initpc), - 9, + 10, }, { func() Frame { var pc, _, _, _ = runtime.Caller(0) return Frame(pc) }(), - 20, + 21, }, { func() Frame { var pc, _, _, _ = runtime.Caller(1) return Frame(pc) }(), - 28, + 24, }, { Frame(0), // invalid PC 0, @@ -66,8 +66,8 @@ func TestFrameFormat(t *testing.T) { }, { Frame(initpc), "%+s", - "github.com/pkg/errors.init\n" + - "\t.+/github.com/pkg/errors/stack_test.go", + "github.com/pingcap/errors.init\n" + + "\t.+/github.com/pingcap/errors/stack_test.go", }, { Frame(0), "%s", @@ -79,7 +79,7 @@ func TestFrameFormat(t *testing.T) { }, { Frame(initpc), "%d", - "9", + "10", }, { Frame(0), "%d", @@ -109,12 +109,12 @@ func TestFrameFormat(t *testing.T) { }, { Frame(initpc), "%v", - "stack_test.go:9", + "stack_test.go:10", }, { Frame(initpc), "%+v", - "github.com/pkg/errors.init\n" + - "\t.+/github.com/pkg/errors/stack_test.go:9", + "github.com/pingcap/errors.init\n" + + "\t.+/github.com/pkg/errors/stack_test.go:10", }, { Frame(0), "%v", @@ -153,25 +153,25 @@ func TestStackTrace(t *testing.T) { want []string }{{ New("ooh"), []string{ - "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:154", + "github.com/pingcap/errors.TestStackTrace\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:155", }, }, { Annotate(New("ooh"), "ahh"), []string{ - "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:159", // this is the stack of Wrap, not New + "github.com/pingcap/errors.TestStackTrace\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:160", // this is the stack of Wrap, not New }, }, { Cause(Annotate(New("ooh"), "ahh")), []string{ - "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:164", // this is the stack of New + "github.com/pingcap/errors.TestStackTrace\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:165", // this is the stack of New }, }, { func() error { return New("ooh") }(), []string{ - `github.com/pkg/errors.(func·009|TestStackTrace.func1)` + - "\n\t.+/github.com/pkg/errors/stack_test.go:169", // this is the stack of New - "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:169", // this is the stack of New's caller + `github.com/pingcap/errors.TestStackTrace.func1` + + "\n\t.+/github.com/pingcap/errors/stack_test.go:170", // this is the stack of New + "github.com/pingcap/errors.TestStackTrace\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:170", // this is the stack of New's caller }, }, { Cause(func() error { @@ -179,12 +179,12 @@ func TestStackTrace(t *testing.T) { return Errorf("hello %s", fmt.Sprintf("world")) }() }()), []string{ - `github.com/pkg/errors.(func·010|TestStackTrace.func2.1)` + - "\n\t.+/github.com/pkg/errors/stack_test.go:178", // this is the stack of Errorf - `github.com/pkg/errors.(func·011|TestStackTrace.func2)` + - "\n\t.+/github.com/pkg/errors/stack_test.go:179", // this is the stack of Errorf's caller - "github.com/pkg/errors.TestStackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:180", // this is the stack of Errorf's caller's caller + `github.com/pingcap/errors.TestStackTrace.func.*` + + "\n\t.+/github.com/pingcap/errors/stack_test.go:179", // this is the stack of Errorf + `github.com/pingcap/errors.TestStackTrace.func.*` + + "\n\t.+/github.com/pingcap/errors/stack_test.go:180", // this is the stack of Errorf's caller + "github.com/pingcap/errors.TestStackTrace\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:181", // this is the stack of Errorf's caller's caller }, }} for i, tt := range tests { @@ -262,14 +262,14 @@ func TestStackTraceFormat(t *testing.T) { stackTrace()[:2], "%+v", "\n" + - "github.com/pkg/errors.stackTrace\n" + - "\t.+/github.com/pkg/errors/stack_test.go:210\n" + - "github.com/pkg/errors.TestStackTraceFormat\n" + - "\t.+/github.com/pkg/errors/stack_test.go:261", + "github.com/pingcap/errors.stackTrace\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:211\n" + + "github.com/pingcap/errors.TestStackTraceFormat\n" + + "\t.+/github.com/pingcap/errors/stack_test.go:262", }, { stackTrace()[:2], "%#v", - `\[\]errors.Frame{stack_test.go:210, stack_test.go:269}`, + `\[\]errors.Frame{stack_test.go:211, stack_test.go:270}`, }} for i, tt := range tests {