Skip to content

Commit 4fb7cfb

Browse files
authored
replace gopkg.in/check.v1 with github.com/stretchr/testify (#241)
1 parent 8b21663 commit 4fb7cfb

File tree

8 files changed

+170
-258
lines changed

8 files changed

+170
-258
lines changed

examples/fs_test.go

Lines changed: 31 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,24 @@
11
package examples
22

33
import (
4-
"bytes"
54
"context"
65
"testing"
76

8-
. "gopkg.in/check.v1"
9-
107
ds "github.com/ipfs/go-datastore"
118
query "github.com/ipfs/go-datastore/query"
9+
"github.com/stretchr/testify/require"
1210
)
1311

14-
// Hook up gocheck into the "go test" runner.
15-
func Test(t *testing.T) { TestingT(t) }
16-
17-
type DSSuite struct {
18-
dir string
19-
ds ds.Datastore
20-
}
21-
22-
var _ = Suite(&DSSuite{})
23-
24-
func (ks *DSSuite) SetUpTest(c *C) {
25-
ks.dir = c.MkDir()
26-
ks.ds, _ = NewDatastore(ks.dir)
27-
}
28-
29-
func (ks *DSSuite) TestOpen(c *C) {
12+
func TestOpen(t *testing.T) {
3013
_, err := NewDatastore("/tmp/foo/bar/baz")
31-
c.Assert(err, Not(Equals), nil)
14+
require.Error(t, err)
3215

3316
// setup ds
34-
_, err = NewDatastore(ks.dir)
35-
c.Assert(err, Equals, nil)
17+
_, err = NewDatastore(t.TempDir())
18+
require.NoError(t, err)
3619
}
3720

38-
func (ks *DSSuite) TestBasic(c *C) {
21+
func TestBasic(t *testing.T) {
3922
ctx := context.Background()
4023

4124
keys := strsToKeys([]string{
@@ -47,48 +30,45 @@ func (ks *DSSuite) TestBasic(c *C) {
4730
"foo/bar/baz/barb",
4831
})
4932

33+
dstore, err := NewDatastore(t.TempDir())
34+
require.NoError(t, err)
5035
for _, k := range keys {
51-
err := ks.ds.Put(ctx, k, []byte(k.String()))
52-
c.Check(err, Equals, nil)
36+
err := dstore.Put(ctx, k, []byte(k.String()))
37+
require.NoError(t, err)
5338
}
5439

5540
for _, k := range keys {
56-
v, err := ks.ds.Get(ctx, k)
57-
c.Check(err, Equals, nil)
58-
c.Check(bytes.Equal(v, []byte(k.String())), Equals, true)
41+
v, err := dstore.Get(ctx, k)
42+
require.NoError(t, err)
43+
require.Equal(t, []byte(k.String()), v)
5944
}
6045

61-
r, err := ks.ds.Query(ctx, query.Query{Prefix: "/foo/bar/"})
62-
if err != nil {
63-
c.Check(err, Equals, nil)
64-
}
46+
r, err := dstore.Query(ctx, query.Query{Prefix: "/foo/bar/"})
47+
require.NoError(t, err)
6548

6649
expect := []string{
6750
"/foo/bar/baz",
6851
"/foo/bar/bazb",
6952
"/foo/bar/baz/barb",
7053
}
7154
all, err := r.Rest()
72-
if err != nil {
73-
c.Fatal(err)
74-
}
75-
c.Check(len(all), Equals, len(expect))
55+
require.NoError(t, err)
56+
require.Equal(t, len(all), len(expect))
7657

7758
for _, k := range expect {
7859
found := false
7960
for _, e := range all {
8061
if e.Key == k {
8162
found = true
63+
break
8264
}
8365
}
8466

85-
if !found {
86-
c.Error("did not find expected key: ", k)
87-
}
67+
require.True(t, found, "did not find expected key:", k)
8868
}
8969
}
9070

91-
func (ks *DSSuite) TestDiskUsage(c *C) {
71+
func TestDiskUsage(t *testing.T) {
9272
ctx := context.Background()
9373

9474
keys := strsToKeys([]string{
@@ -100,21 +80,23 @@ func (ks *DSSuite) TestDiskUsage(c *C) {
10080
"foo/bar/baz/barb",
10181
})
10282

83+
dstore, err := NewDatastore(t.TempDir())
84+
require.NoError(t, err)
85+
10386
totalBytes := 0
10487
for _, k := range keys {
10588
value := []byte(k.String())
10689
totalBytes += len(value)
107-
err := ks.ds.Put(ctx, k, value)
108-
c.Check(err, Equals, nil)
90+
err := dstore.Put(ctx, k, value)
91+
require.NoError(t, err)
10992
}
11093

111-
if ps, ok := ks.ds.(ds.PersistentDatastore); ok {
112-
if s, err := ps.DiskUsage(ctx); s != uint64(totalBytes) || err != nil {
113-
c.Error("unexpected size is: ", s)
114-
}
115-
} else {
116-
c.Error("should implement PersistentDatastore")
117-
}
94+
ps, ok := dstore.(ds.PersistentDatastore)
95+
require.True(t, ok, "should implement PersistentDatastore")
96+
97+
s, err := ps.DiskUsage(ctx)
98+
require.NoError(t, err)
99+
require.Equal(t, uint64(totalBytes), s, "unexpected size")
118100
}
119101

120102
func strsToKeys(strs []string) []ds.Key {

fuzz/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/ipfs/go-datastore/fuzz
22

3-
go 1.23
3+
go 1.23.0
44

55
require (
66
github.com/ipfs/go-datastore v0.8.0
@@ -18,3 +18,5 @@ require (
1818
go.uber.org/zap v1.24.0 // indirect
1919
golang.org/x/sys v0.4.0 // indirect
2020
)
21+
22+
replace github.com/ipfs/go-datastore => ../

fuzz/go.sum

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
77
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
88
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
99
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
10-
github.com/ipfs/go-datastore v0.8.0 h1:n8xKnoSTo/28L5KM+Jfz4kfohD889/afdWcDHve9VuY=
11-
github.com/ipfs/go-datastore v0.8.0/go.mod h1:BGN3N+sLTEWQUHMtOjmm2GKccMJnVFPgSLp6kshNqRk=
10+
github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
11+
github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
1212
github.com/ipfs/go-ds-flatfs v0.5.3 h1:NQsaiepf8k93rbiTb6eY/0Qaoako2cEVsXT++Q/t9Bw=
1313
github.com/ipfs/go-ds-flatfs v0.5.3/go.mod h1:hCh3OKNvlqPQ+retNJy8402Oej6QpX4U18OYzLrfLR8=
1414
github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
1515
github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
1616
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
17-
github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
18-
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
1917
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
20-
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2118
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2219
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
2320
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
@@ -31,8 +28,8 @@ github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
3128
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3229
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
3330
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
34-
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
35-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
31+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
32+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
3633
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
3734
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
3835
go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
@@ -77,8 +74,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
7774
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7875
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
7976
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
80-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
81-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
8277
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
8378
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
8479
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ require (
66
github.com/google/uuid v1.6.0
77
github.com/ipfs/go-detect-race v0.0.1
88
github.com/ipfs/go-ipfs-delay v0.0.1
9+
github.com/stretchr/testify v1.10.0
910
go.opentelemetry.io/otel v1.37.0
1011
go.opentelemetry.io/otel/trace v1.37.0
1112
go.uber.org/multierr v1.11.0
12-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
1313
)
1414

1515
require (
16+
github.com/davecgh/go-spew v1.1.1 // indirect
1617
github.com/go-logr/logr v1.4.3 // indirect
1718
github.com/go-logr/stdr v1.2.2 // indirect
18-
github.com/kr/pretty v0.3.1 // indirect
19-
github.com/kr/text v0.2.0 // indirect
20-
github.com/rogpeppe/go-internal v1.13.1 // indirect
19+
github.com/pmezard/go-difflib v1.0.0 // indirect
2120
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
2221
go.opentelemetry.io/otel/metric v1.37.0 // indirect
22+
gopkg.in/yaml.v3 v3.0.1 // indirect
2323
)

go.sum

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
21
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
32
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
43
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -14,17 +13,12 @@ github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ
1413
github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
1514
github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
1615
github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
17-
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
1816
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1917
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
20-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
21-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2218
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
2319
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
24-
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
2520
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2621
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
27-
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
2822
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
2923
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
3024
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
@@ -39,6 +33,7 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
3933
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
4034
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
4135
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
36+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
4237
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
4338
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
4439
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

0 commit comments

Comments
 (0)