Skip to content

Commit 6be0f70

Browse files
dnephindnephin
committed
Automated migration using
gty-migrate-from-testify --ignore-build-tags Signed-off-by: Daniel Nephin <[email protected]>
1 parent ef01dea commit 6be0f70

183 files changed

Lines changed: 2257 additions & 2203 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/server/middleware/debug_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ package middleware // import "github.com/docker/docker/api/server/middleware"
33
import (
44
"testing"
55

6-
"github.com/stretchr/testify/assert"
6+
"github.com/gotestyourself/gotestyourself/assert"
7+
is "github.com/gotestyourself/gotestyourself/assert/cmp"
78
)
89

910
func TestMaskSecretKeys(t *testing.T) {
@@ -53,6 +54,6 @@ func TestMaskSecretKeys(t *testing.T) {
5354

5455
for _, testcase := range tests {
5556
maskSecretKeys(testcase.input, testcase.path)
56-
assert.Equal(t, testcase.expected, testcase.input)
57+
assert.Check(t, is.DeepEqual(testcase.expected, testcase.input))
5758
}
5859
}

‎api/server/middleware/version_test.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import (
77
"testing"
88

99
"github.com/docker/docker/api/server/httputils"
10-
"github.com/stretchr/testify/assert"
10+
"github.com/gotestyourself/gotestyourself/assert"
11+
is "github.com/gotestyourself/gotestyourself/assert/cmp"
1112
"golang.org/x/net/context"
1213
)
1314

@@ -17,7 +18,7 @@ func TestVersionMiddlewareVersion(t *testing.T) {
1718
expectedVersion := defaultVersion
1819
handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
1920
v := httputils.VersionFromContext(ctx)
20-
assert.Equal(t, expectedVersion, v)
21+
assert.Check(t, is.Equal(expectedVersion, v))
2122
return nil
2223
}
2324

@@ -56,17 +57,17 @@ func TestVersionMiddlewareVersion(t *testing.T) {
5657
err := h(ctx, resp, req, map[string]string{"version": test.reqVersion})
5758

5859
if test.errString != "" {
59-
assert.EqualError(t, err, test.errString)
60+
assert.Check(t, is.Error(err, test.errString))
6061
} else {
61-
assert.NoError(t, err)
62+
assert.Check(t, err)
6263
}
6364
}
6465
}
6566

6667
func TestVersionMiddlewareWithErrorsReturnsHeaders(t *testing.T) {
6768
handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
6869
v := httputils.VersionFromContext(ctx)
69-
assert.NotEmpty(t, v)
70+
assert.Check(t, len(v) != 0)
7071
return nil
7172
}
7273

@@ -81,11 +82,11 @@ func TestVersionMiddlewareWithErrorsReturnsHeaders(t *testing.T) {
8182

8283
vars := map[string]string{"version": "0.1"}
8384
err := h(ctx, resp, req, vars)
84-
assert.Error(t, err)
85+
assert.Check(t, is.ErrorContains(err, ""))
8586

8687
hdr := resp.Result().Header
87-
assert.Contains(t, hdr.Get("Server"), "Docker/"+defaultVersion)
88-
assert.Contains(t, hdr.Get("Server"), runtime.GOOS)
89-
assert.Equal(t, hdr.Get("API-Version"), defaultVersion)
90-
assert.Equal(t, hdr.Get("OSType"), runtime.GOOS)
88+
assert.Check(t, is.Contains(hdr.Get("Server"), "Docker/"+defaultVersion))
89+
assert.Check(t, is.Contains(hdr.Get("Server"), runtime.GOOS))
90+
assert.Check(t, is.Equal(hdr.Get("API-Version"), defaultVersion))
91+
assert.Check(t, is.Equal(hdr.Get("OSType"), runtime.GOOS))
9192
}

‎api/types/filters/parse_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"errors"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
8-
"github.com/stretchr/testify/require"
7+
"github.com/gotestyourself/gotestyourself/assert"
8+
is "github.com/gotestyourself/gotestyourself/assert/cmp"
99
)
1010

1111
func TestParseArgs(t *testing.T) {
@@ -22,10 +22,10 @@ func TestParseArgs(t *testing.T) {
2222

2323
for i := range flagArgs {
2424
args, err = ParseFlag(flagArgs[i], args)
25-
require.NoError(t, err)
25+
assert.NilError(t, err)
2626
}
27-
assert.Len(t, args.Get("created"), 1)
28-
assert.Len(t, args.Get("image.name"), 2)
27+
assert.Check(t, is.Len(args.Get("created"), 1))
28+
assert.Check(t, is.Len(args.Get("image.name"), 2))
2929
}
3030

3131
func TestParseArgsEdgeCase(t *testing.T) {
@@ -231,7 +231,7 @@ func TestArgsMatch(t *testing.T) {
231231
}
232232

233233
for args, field := range matches {
234-
assert.True(t, args.Match(field, source),
234+
assert.Check(t, args.Match(field, source),
235235
"Expected field %s to match %s", field, source)
236236
}
237237

@@ -255,8 +255,7 @@ func TestArgsMatch(t *testing.T) {
255255
}
256256

257257
for args, field := range differs {
258-
assert.False(t, args.Match(field, source),
259-
"Expected field %s to not match %s", field, source)
258+
assert.Check(t, !args.Match(field, source), "Expected field %s to not match %s", field, source)
260259
}
261260
}
262261

‎builder/dockerfile/buildargs_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import (
44
"bytes"
55
"testing"
66

7-
"github.com/stretchr/testify/assert"
7+
"github.com/gotestyourself/gotestyourself/assert"
8+
is "github.com/gotestyourself/gotestyourself/assert/cmp"
89
)
910

1011
func strPtr(source string) *string {
@@ -39,7 +40,7 @@ func TestGetAllAllowed(t *testing.T) {
3940
"ArgFromMeta": "frommeta1",
4041
"ArgFromMetaOverridden": "fromdockerfile3",
4142
}
42-
assert.Equal(t, expected, all)
43+
assert.Check(t, is.DeepEqual(expected, all))
4344
}
4445

4546
func TestGetAllMeta(t *testing.T) {
@@ -61,7 +62,7 @@ func TestGetAllMeta(t *testing.T) {
6162
"ArgOverriddenByOptions": "fromopt2",
6263
"ArgNoDefaultInMetaFromOptions": "fromopt3",
6364
}
64-
assert.Equal(t, expected, all)
65+
assert.Check(t, is.DeepEqual(expected, all))
6566
}
6667

6768
func TestWarnOnUnusedBuildArgs(t *testing.T) {
@@ -80,7 +81,7 @@ func TestWarnOnUnusedBuildArgs(t *testing.T) {
8081
assert.NotContains(t, out, "ThisArgIsUsed")
8182
assert.NotContains(t, out, "HTTPS_PROXY")
8283
assert.NotContains(t, out, "HTTP_PROXY")
83-
assert.Contains(t, out, "ThisArgIsNotUsed")
84+
assert.Check(t, is.Contains(out, "ThisArgIsNotUsed"))
8485
}
8586

8687
func TestIsUnreferencedBuiltin(t *testing.T) {
@@ -93,8 +94,8 @@ func TestIsUnreferencedBuiltin(t *testing.T) {
9394
buildArgs.AddArg("ThisArgIsUsed", nil)
9495
buildArgs.AddArg("HTTPS_PROXY", nil)
9596

96-
assert.True(t, buildArgs.IsReferencedOrNotBuiltin("ThisArgIsUsed"))
97-
assert.True(t, buildArgs.IsReferencedOrNotBuiltin("ThisArgIsNotUsed"))
98-
assert.True(t, buildArgs.IsReferencedOrNotBuiltin("HTTPS_PROXY"))
99-
assert.False(t, buildArgs.IsReferencedOrNotBuiltin("HTTP_PROXY"))
97+
assert.Check(t, buildArgs.IsReferencedOrNotBuiltin("ThisArgIsUsed"))
98+
assert.Check(t, buildArgs.IsReferencedOrNotBuiltin("ThisArgIsNotUsed"))
99+
assert.Check(t, buildArgs.IsReferencedOrNotBuiltin("HTTPS_PROXY"))
100+
assert.Check(t, !buildArgs.IsReferencedOrNotBuiltin("HTTP_PROXY"))
100101
}

‎builder/dockerfile/builder_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import (
55
"testing"
66

77
"github.com/docker/docker/builder/dockerfile/parser"
8-
"github.com/stretchr/testify/assert"
8+
"github.com/gotestyourself/gotestyourself/assert"
9+
is "github.com/gotestyourself/gotestyourself/assert/cmp"
910
)
1011

1112
func TestAddNodesForLabelOption(t *testing.T) {
1213
dockerfile := "FROM scratch"
1314
result, err := parser.Parse(strings.NewReader(dockerfile))
14-
assert.NoError(t, err)
15+
assert.Check(t, err)
1516

1617
labels := map[string]string{
1718
"org.e": "cli-e",
@@ -27,8 +28,8 @@ func TestAddNodesForLabelOption(t *testing.T) {
2728
"FROM scratch",
2829
`LABEL "org.a"='cli-a' "org.b"='cli-b' "org.c"='cli-c' "org.d"='cli-d' "org.e"='cli-e'`,
2930
}
30-
assert.Len(t, nodes.Children, 2)
31+
assert.Check(t, is.Len(nodes.Children, 2))
3132
for i, v := range nodes.Children {
32-
assert.Equal(t, expected[i], v.Original)
33+
assert.Check(t, is.Equal(expected[i], v.Original))
3334
}
3435
}

‎builder/dockerfile/copy_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import (
55
"testing"
66

77
"github.com/docker/docker/pkg/containerfs"
8+
"github.com/gotestyourself/gotestyourself/assert"
9+
is "github.com/gotestyourself/gotestyourself/assert/cmp"
810
"github.com/gotestyourself/gotestyourself/fs"
9-
"github.com/stretchr/testify/assert"
1011
)
1112

1213
func TestIsExistingDirectory(t *testing.T) {
@@ -39,10 +40,10 @@ func TestIsExistingDirectory(t *testing.T) {
3940

4041
for _, testcase := range testcases {
4142
result, err := isExistingDirectory(&copyEndpoint{driver: containerfs.NewLocalDriver(), path: testcase.path})
42-
if !assert.NoError(t, err) {
43+
if !assert.Check(t, err) {
4344
continue
4445
}
45-
assert.Equal(t, testcase.expected, result, testcase.doc)
46+
assert.Check(t, is.Equal(testcase.expected, result), testcase.doc)
4647
}
4748
}
4849

@@ -142,6 +143,6 @@ func TestGetFilenameForDownload(t *testing.T) {
142143
resp.Header.Add("Content-Disposition", testcase.disposition)
143144
}
144145
filename := getFilenameForDownload(testcase.path, &resp)
145-
assert.Equal(t, testcase.expected, filename)
146+
assert.Check(t, is.Equal(testcase.expected, filename))
146147
}
147148
}

0 commit comments

Comments
 (0)