Skip to content

Commit bc0f87f

Browse files
committed
Updates for go 1.17
1 parent f5c8af6 commit bc0f87f

File tree

6 files changed

+62
-34
lines changed

6 files changed

+62
-34
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
1414
.glide/
1515

16-
coverage.txt
16+
coverage.txt
17+
/vendor

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ language: go
33
sudo: false
44

55
go:
6-
- 1.4
7-
- 1.5
8-
- 1.6
9-
- 1.7
10-
- 1.8
6+
- 1.14
7+
- 1.15
8+
- 1.16
9+
- 1.17
10+
1111
before_install:
1212
- go get -t -v ./...
1313

1414
script:
1515
- go test -race -coverprofile=coverage.txt -covermode=atomic
1616

1717
after_success:
18-
- bash <(curl -s https://codecov.io/bash) -t 7fee0497-8d0f-490b-b8e1-89851dbdfe96
18+
- bash <(curl -s https://codecov.io/bash) -t 7fee0497-8d0f-490b-b8e1-89851dbdfe96

README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,23 @@ Output:
6767

6868
```console
6969
Error Stacktrace:
70-
-> github.com/efimovalex/stackerr/example/main.go:29 (main.main)
71-
-> github.com/efimovalex/stackerr/example/main.go:23 (main.(*t1).f3)
72-
-> github.com/efimovalex/stackerr/example/main.go:16 (main.f2) context
73-
-> github.com/efimovalex/stackerr/example/main.go:11 (main.f1)
70+
-> /home/efi/workspace/stackerr/example/main.go:29 (main.main)
71+
-> /home/efi/workspace/stackerr/example/main.go:24 (main.(*t1).f3)
72+
-> /home/efi/workspace/stackerr/example/main.go:17 (main.f2) context
73+
-> /home/efi/workspace/stackerr/example/main.go:11 (main.f1)
7474

7575
message
76-
7776
404
78-
7977
Resource is not found
8078

81-
2017/09/05 17:32:15 Error Stacktrace:
82-
-> github.com/efimovalex/stackerr/example/main.go:29 (main.main)
83-
-> github.com/efimovalex/stackerr/example/main.go:23 (main.(*t1).f3)
84-
-> github.com/efimovalex/stackerr/example/main.go:16 (main.f2) context
85-
-> github.com/efimovalex/stackerr/example/main.go:11 (main.f1)
79+
2021/10/26 17:58:11 Error Stacktrace:
80+
-> /home/efi/workspace/stackerr/example/main.go:29 (main.main)
81+
-> /home/efi/workspace/stackerr/example/main.go:24 (main.(*t1).f3)
82+
-> /home/efi/workspace/stackerr/example/main.go:17 (main.f2) context
83+
-> /home/efi/workspace/stackerr/example/main.go:11 (main.f1)
84+
85+
2021/10/26 17:58:11 Error Stacktrace:
86+
-> /home/efi/workspace/stackerr/example/main.go:41 (main.main)
8687
```
8788
## Authors
8889

go.mod

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module github.com/efimovalex/stackerr
2+
3+
go 1.17
4+
5+
require github.com/stretchr/testify v1.7.0
6+
7+
require (
8+
github.com/davecgh/go-spew v1.1.0 // indirect
9+
github.com/pmezard/go-difflib v1.0.0 // indirect
10+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
11+
)

go.sum

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
2+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
5+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
6+
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
7+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
8+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
9+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
11+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

goerr_test.go

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package stackerr
33
import (
44
"bytes"
55
"errors"
6+
"fmt"
67
"io"
78
"log"
89
"net/http"
@@ -30,18 +31,19 @@ func (t *t1) f3() *Err {
3031
}
3132

3233
func TestStackTrace(t *testing.T) {
34+
path, _ := os.Getwd()
3335
ts := t1{}
3436
err := ts.f3()
3537

3638
assert.NotNil(t, err)
3739
assert.Equal(t, "message", err.Error())
3840
assert.Equal(t,
39-
`Error Stacktrace:
40-
-> github.com/efimovalex/stackerr/goerr_test.go:34 (stackerr.TestStackTrace)
41-
-> github.com/efimovalex/stackerr/goerr_test.go:28 (stackerr.(*t1).f3)
42-
-> github.com/efimovalex/stackerr/goerr_test.go:21 (stackerr.f2) context
43-
-> github.com/efimovalex/stackerr/goerr_test.go:16 (stackerr.f1)
44-
`, err.Sprint())
41+
fmt.Sprintf(`Error Stacktrace:
42+
-> %[1]s/goerr_test.go:36 (stackerr.TestStackTrace)
43+
-> %[1]s/goerr_test.go:30 (stackerr.(*t1).f3)
44+
-> %[1]s/goerr_test.go:23 (stackerr.f2) context
45+
-> %[1]s/goerr_test.go:18 (stackerr.f1)
46+
`, path), err.Sprint())
4547
}
4648

4749
func TestNew(t *testing.T) {
@@ -74,17 +76,18 @@ func TestNewWithStatusCode(t *testing.T) {
7476
assert.Equal(t, http.StatusOK, err.StatusCode)
7577
}
7678
func TestLog(t *testing.T) {
79+
path, _ := os.Getwd()
7780
var buf bytes.Buffer
7881
log.SetOutput(&buf)
7982
err := f2()
8083
err.Log()
8184
log.SetOutput(os.Stderr)
8285
assert.Contains(t, buf.String(),
83-
`Error Stacktrace:
84-
-> github.com/efimovalex/stackerr/goerr_test.go:79 (stackerr.TestLog)
85-
-> github.com/efimovalex/stackerr/goerr_test.go:21 (stackerr.f2) context
86-
-> github.com/efimovalex/stackerr/goerr_test.go:16 (stackerr.f1)
87-
`)
86+
fmt.Sprintf(`Error Stacktrace:
87+
-> %[1]s/goerr_test.go:83 (stackerr.TestLog)
88+
-> %[1]s/goerr_test.go:23 (stackerr.f2) context
89+
-> %[1]s/goerr_test.go:18 (stackerr.f1)
90+
`, path))
8891
}
8992

9093
func TestIsNotFound(t *testing.T) {
@@ -98,6 +101,7 @@ func TestIsNotFound(t *testing.T) {
98101
}
99102

100103
func TestPrint(t *testing.T) {
104+
path, _ := os.Getwd()
101105
old := os.Stdout // keep backup of the real stdout
102106
r, w, _ := os.Pipe()
103107
os.Stdout = w
@@ -117,9 +121,9 @@ func TestPrint(t *testing.T) {
117121
out := <-outC
118122

119123
assert.Equal(t, out,
120-
`Error Stacktrace:
121-
-> github.com/efimovalex/stackerr/goerr_test.go:112 (stackerr.TestPrint)
122-
-> github.com/efimovalex/stackerr/goerr_test.go:21 (stackerr.f2) context
123-
-> github.com/efimovalex/stackerr/goerr_test.go:16 (stackerr.f1)
124-
`)
124+
fmt.Sprintf(`Error Stacktrace:
125+
-> %[1]s/goerr_test.go:117 (stackerr.TestPrint)
126+
-> %[1]s/goerr_test.go:23 (stackerr.f2) context
127+
-> %[1]s/goerr_test.go:18 (stackerr.f1)
128+
`, path))
125129
}

0 commit comments

Comments
 (0)