Skip to content

Commit 0158a6f

Browse files
mlaventuremlaventure
authored
Merge pull request #2393 from vdemeester/gotestyourself-with-tools
Update gotestyourself to gotest.tools
2 parents 35887db + 832b05a commit 0158a6f

File tree

29 files changed

+435
-526
lines changed

29 files changed

+435
-526
lines changed

‎cio/io_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232

3333
"github.com/containerd/fifo"
3434
"github.com/google/go-cmp/cmp/cmpopts"
35-
"github.com/gotestyourself/gotestyourself/assert"
36-
is "github.com/gotestyourself/gotestyourself/assert/cmp"
35+
"gotest.tools/assert"
36+
is "gotest.tools/assert/cmp"
3737
)
3838

3939
func assertHasPrefix(t *testing.T, s, prefix string) {

‎cio/io_unix_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"path/filepath"
2424
"testing"
2525

26-
"github.com/gotestyourself/gotestyourself/assert"
26+
"gotest.tools/assert"
2727
)
2828

2929
func TestOpenFifos(t *testing.T) {

‎content/helpers_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"testing"
2626

2727
"github.com/containerd/containerd/errdefs"
28-
"github.com/gotestyourself/gotestyourself/assert"
29-
is "github.com/gotestyourself/gotestyourself/assert/cmp"
3028
"github.com/opencontainers/go-digest"
29+
"gotest.tools/assert"
30+
is "gotest.tools/assert/cmp"
3131
)
3232

3333
type copySource struct {

‎content/local/store_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ import (
3737
"github.com/containerd/containerd/content"
3838
"github.com/containerd/containerd/content/testsuite"
3939
"github.com/containerd/containerd/pkg/testutil"
40-
"github.com/gotestyourself/gotestyourself/assert"
4140
"github.com/opencontainers/go-digest"
4241
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
42+
"gotest.tools/assert"
4343
)
4444

4545
type memoryLabelStore struct {

‎content/testsuite/testsuite.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ import (
3131

3232
"github.com/containerd/containerd/content"
3333
"github.com/containerd/containerd/pkg/testutil"
34-
"github.com/gotestyourself/gotestyourself/assert"
3534
digest "github.com/opencontainers/go-digest"
3635
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
3736
"github.com/pkg/errors"
37+
"gotest.tools/assert"
3838
)
3939

4040
// ContentSuite runs a test suite on the content store given a factory function.

‎gc/scheduler/scheduler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/containerd/containerd/gc"
26-
"github.com/gotestyourself/gotestyourself/assert"
26+
"gotest.tools/assert"
2727
)
2828

2929
func TestPauseThreshold(t *testing.T) {

‎images/oci/importer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package oci
1919
import (
2020
"testing"
2121

22-
"github.com/gotestyourself/gotestyourself/assert"
2322
"github.com/opencontainers/go-digest"
2423
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
24+
"gotest.tools/assert"
2525
)
2626

2727
func TestNormalizeImageRef(t *testing.T) {

‎log/context_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"testing"
2222

23-
"github.com/gotestyourself/gotestyourself/assert"
23+
"gotest.tools/assert"
2424
)
2525

2626
func TestLoggerContext(t *testing.T) {

‎mount/lookup_test/lookup_linux_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636

3737
"github.com/containerd/containerd/mount"
3838
"github.com/containerd/containerd/pkg/testutil"
39-
"github.com/gotestyourself/gotestyourself/assert"
39+
"gotest.tools/assert"
4040
)
4141

4242
func checkLookup(t *testing.T, fsType, mntPoint, dir string) {

‎pkg/testutil/helpers_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"testing"
2525

2626
"github.com/containerd/containerd/mount"
27-
"github.com/gotestyourself/gotestyourself/assert"
27+
"gotest.tools/assert"
2828
)
2929

3030
// Unmount unmounts a given mountPoint and sets t.Error if it fails

‎remotes/docker/scope_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"testing"
2121

2222
"github.com/containerd/containerd/reference"
23-
"github.com/gotestyourself/gotestyourself/assert"
23+
"gotest.tools/assert"
2424
)
2525

2626
func TestRepositoryScope(t *testing.T) {

‎services/server/server_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"context"
2121
"testing"
2222

23-
"github.com/gotestyourself/gotestyourself/assert"
24-
is "github.com/gotestyourself/gotestyourself/assert/cmp"
23+
"gotest.tools/assert"
24+
is "gotest.tools/assert/cmp"
2525
)
2626

2727
func TestNewErrorsWithSamePathForRootAndState(t *testing.T) {

‎snapshots/storage/metastore_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"github.com/containerd/containerd/errdefs"
2828
"github.com/containerd/containerd/snapshots"
2929
"github.com/google/go-cmp/cmp"
30-
"github.com/gotestyourself/gotestyourself/assert"
31-
is "github.com/gotestyourself/gotestyourself/assert/cmp"
3230
"github.com/pkg/errors"
31+
"gotest.tools/assert"
32+
is "gotest.tools/assert/cmp"
3333
)
3434

3535
type testFunc func(context.Context, *testing.T, *MetaStore)

‎snapshots/testsuite/testsuite.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
"github.com/containerd/containerd/pkg/testutil"
3333
"github.com/containerd/containerd/snapshots"
3434
"github.com/containerd/continuity/fs/fstest"
35-
"github.com/gotestyourself/gotestyourself/assert"
36-
is "github.com/gotestyourself/gotestyourself/assert/cmp"
35+
"gotest.tools/assert"
36+
is "gotest.tools/assert/cmp"
3737
)
3838

3939
// SnapshotterSuite runs a test suite on the snapshotter given a factory function.

‎sys/oom_unix_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import (
2929
"testing"
3030
"time"
3131

32-
"github.com/gotestyourself/gotestyourself/assert"
33-
is "github.com/gotestyourself/gotestyourself/assert/cmp"
32+
"gotest.tools/assert"
33+
is "gotest.tools/assert/cmp"
3434
)
3535

3636
func TestSetPositiveOomScoreAdjustment(t *testing.T) {

‎vendor.conf

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ github.com/golang/protobuf v1.1.0
2222
github.com/opencontainers/runtime-spec v1.0.1
2323
github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340
2424
github.com/sirupsen/logrus v1.0.0
25-
github.com/pmezard/go-difflib v1.0.0
2625
github.com/urfave/cli 7bc6a0acffa589f415f88aca16cc1de5ffd66f9c
2726
golang.org/x/net b3756b4b77d7b13260a0a2ec658753cf48922eac
2827
google.golang.org/grpc v1.12.0
@@ -40,7 +39,7 @@ google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
4039
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
4140
github.com/stevvooe/ttrpc d4528379866b0ce7e9d71f3eb96f0582fc374577
4241
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16
43-
github.com/gotestyourself/gotestyourself 44dbf532bbf5767611f6f2a61bded572e337010a
42+
gotest.tools v2.1.0
4443
github.com/google/go-cmp v0.1.0
4544

4645
github.com/containerd/cri 8bcb9a95394e8d7845da1d6a994d3ac2a86d22f0

‎vendor/github.com/gotestyourself/gotestyourself/README.md

-33
This file was deleted.

‎vendor/github.com/pmezard/go-difflib/README.md

-50
This file was deleted.

‎vendor/github.com/gotestyourself/gotestyourself/LICENSE ‎vendor/gotest.tools/LICENSE

File renamed without changes.

‎vendor/gotest.tools/README.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# gotest.tools
2+
3+
A collection of packages to augment `testing` and support common patterns.
4+
5+
[![GoDoc](https://godoc.org/gotest.tools?status.svg)](https://godoc.org/gotest.tools)
6+
[![CircleCI](https://circleci.com/gh/gotestyourself/gotestyourself/tree/master.svg?style=shield)](https://circleci.com/gh/gotestyourself/gotestyourself/tree/master)
7+
[![Go Reportcard](https://goreportcard.com/badge/gotest.tools)](https://goreportcard.com/report/gotest.tools)
8+
9+
10+
## Packages
11+
12+
* [assert](http://godoc.org/gotest.tools/assert) -
13+
compare values and fail the test when a comparison fails
14+
* [env](http://godoc.org/gotest.tools/env) -
15+
test code which uses environment variables
16+
* [fs](http://godoc.org/gotest.tools/fs) -
17+
create temporary files and compare a filesystem tree to an expected value
18+
* [golden](http://godoc.org/gotest.tools/golden) -
19+
compare large multi-line strings against values frozen in golden files
20+
* [icmd](http://godoc.org/gotest.tools/icmd) -
21+
execute binaries and test the output
22+
* [poll](http://godoc.org/gotest.tools/poll) -
23+
test asynchronous code by polling until a desired state is reached
24+
* [skip](http://godoc.org/gotest.tools/skip) -
25+
skip a test and print the source code of the condition used to skip the test
26+
27+
## Related
28+
29+
* [gotest.tools/gotestsum](https://github.com/gotestyourself/gotestsum) - go test runner with custom output
30+
* [maxbrunsfeld/counterfeiter](https://github.com/maxbrunsfeld/counterfeiter) - generate fakes for interfaces
31+
* [jonboulle/clockwork](https://github.com/jonboulle/clockwork) - a fake clock for testing code that uses `time`

0 commit comments

Comments
 (0)