Skip to content

Commit e203340

Browse files
authored
Merge pull request #19 from Pix4D/fix-errcheck-lint
fix issue raised by lint errcheck
2 parents cc637ef + f892e39 commit e203340

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ require (
66
github.com/dexyk/stringosim v0.0.0-20170922105913-9d0b3e91a842
77
github.com/google/go-cmp v0.5.4
88
github.com/integrii/flaggy v1.4.4
9-
github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7
109
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e
1110
)

go.sum

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
21
github.com/dexyk/stringosim v0.0.0-20170922105913-9d0b3e91a842 h1:FWXGhOthNyZKdK0YVyDrkg5dCXOfKvexcRG37U1v6AQ=
32
github.com/dexyk/stringosim v0.0.0-20170922105913-9d0b3e91a842/go.mod h1:PfVoEMbmPGFArz22/wIefW9CzuQhdnE+C9ikEzJvb9Q=
43
github.com/fatih/set v0.2.1 h1:nn2CaJyknWE/6txyUDGwysr3G5QC6xWB/PtVjPBbeaA=
@@ -7,16 +6,7 @@ github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
76
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
87
github.com/integrii/flaggy v1.4.4 h1:8fGyiC14o0kxhTqm2VBoN19fDKPZsKipP7yggreTMDc=
98
github.com/integrii/flaggy v1.4.4/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI=
10-
github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7 h1:+/+DxvQaYifJ+grD4klzrS5y+KJXldn/2YTl5JG+vZ8=
11-
github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7/go.mod h1:zO8QMzTeZd5cpnIkz/Gn6iK0jDfGicM1nynOkkPIl28=
12-
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
139
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e h1:7q6NSFZDeGfvvtIRwBrU/aegEYJYmvev0cHAwo17zZQ=
1410
github.com/scylladb/go-set v1.0.3-0.20200225121959-cc7b2070d91e/go.mod h1:DkpGd78rljTxKAnTDPFqXSGxvETQnJyuSOQwsHycqfs=
15-
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
16-
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
17-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
18-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
1911
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
2012
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
21-
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
22-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

main_test.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"bytes"
54
"errors"
65
"fmt"
76
"io/ioutil"
@@ -10,7 +9,6 @@ import (
109
"testing"
1110

1211
"github.com/google/go-cmp/cmp"
13-
"github.com/pkg/diff"
1412
"github.com/scylladb/go-set"
1513
"github.com/scylladb/go-set/strset"
1614
)
@@ -207,15 +205,11 @@ func runSuccess(t *testing.T, args []string, wantUpPath string, wantDownPath str
207205
t.Fatalf("reading tmp down file: %v", err)
208206
}
209207

210-
if !bytes.Equal(tmpUp, wantUp) {
211-
var outDiff bytes.Buffer
212-
diff.Text("got", wantUpPath, tmpUp, wantUp, &outDiff)
213-
t.Errorf("\nup script: got the following differences:\n%v", outDiff.String())
208+
if diff := cmp.Diff(tmpUp, wantUp, cmpOpt); diff != "" {
209+
t.Errorf("\nup script: mismatch (-want +got):\n%s", diff)
214210
}
215-
if !bytes.Equal(tmpDown, wantDown) {
216-
var outDiff bytes.Buffer
217-
diff.Text("got", wantDownPath, tmpDown, wantDown, &outDiff)
218-
t.Errorf("\ndown script: got the following differences:\n%v", outDiff.String())
211+
if diff := cmp.Diff(tmpDown, wantDown, cmpOpt); diff != "" {
212+
t.Errorf("\ndown script: mismatch (-want +got):\n%s", diff)
219213
}
220214
}
221215

0 commit comments

Comments
 (0)