Skip to content

Commit c9e52bd

Browse files
dnephindnephin
committed
Post migration assertion fixes
Signed-off-by: Daniel Nephin <[email protected]>
1 parent 6be0f70 commit c9e52bd

23 files changed

Lines changed: 184 additions & 136 deletions

File tree

‎builder/dockerfile/buildargs_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dockerfile // import "github.com/docker/docker/builder/dockerfile"
22

33
import (
44
"bytes"
5+
"strings"
56
"testing"
67

78
"github.com/gotestyourself/gotestyourself/assert"
@@ -78,9 +79,9 @@ func TestWarnOnUnusedBuildArgs(t *testing.T) {
7879
buffer := new(bytes.Buffer)
7980
buildArgs.WarnOnUnusedBuildArgs(buffer)
8081
out := buffer.String()
81-
assert.NotContains(t, out, "ThisArgIsUsed")
82-
assert.NotContains(t, out, "HTTPS_PROXY")
83-
assert.NotContains(t, out, "HTTP_PROXY")
82+
assert.Assert(t, !strings.Contains(out, "ThisArgIsUsed"), out)
83+
assert.Assert(t, !strings.Contains(out, "HTTPS_PROXY"), out)
84+
assert.Assert(t, !strings.Contains(out, "HTTP_PROXY"), out)
8485
assert.Check(t, is.Contains(out, "ThisArgIsNotUsed"))
8586
}
8687

‎builder/dockerfile/parser/line_parsers_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package parser // import "github.com/docker/docker/builder/dockerfile/parser"
33
import (
44
"testing"
55

6+
"github.com/google/go-cmp/cmp"
67
"github.com/gotestyourself/gotestyourself/assert"
78
is "github.com/gotestyourself/gotestyourself/assert/cmp"
89
)
@@ -16,9 +17,11 @@ func TestParseNameValOldFormat(t *testing.T) {
1617
Value: "foo",
1718
Next: &Node{Value: "bar"},
1819
}
19-
assert.Check(t, is.DeepEqual(expected, node))
20+
assert.DeepEqual(t, expected, node, cmpNodeOpt)
2021
}
2122

23+
var cmpNodeOpt = cmp.AllowUnexported(Node{})
24+
2225
func TestParseNameValNewFormat(t *testing.T) {
2326
directive := Directive{}
2427
node, err := parseNameVal("foo=bar thing=star", "LABEL", &directive)
@@ -36,7 +39,7 @@ func TestParseNameValNewFormat(t *testing.T) {
3639
},
3740
},
3841
}
39-
assert.Check(t, is.DeepEqual(expected, node))
42+
assert.DeepEqual(t, expected, node, cmpNodeOpt)
4043
}
4144

4245
func TestNodeFromLabels(t *testing.T) {
@@ -62,8 +65,7 @@ func TestNodeFromLabels(t *testing.T) {
6265
}
6366

6467
node := NodeFromLabels(labels)
65-
assert.Check(t, is.DeepEqual(expected, node))
66-
68+
assert.DeepEqual(t, expected, node, cmpNodeOpt)
6769
}
6870

6971
func TestParseNameValWithoutVal(t *testing.T) {

‎builder/remotecontext/git/gitutils_test.go‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,39 @@ import (
1313
"strings"
1414
"testing"
1515

16+
"github.com/google/go-cmp/cmp"
1617
"github.com/gotestyourself/gotestyourself/assert"
1718
is "github.com/gotestyourself/gotestyourself/assert/cmp"
1819
)
1920

2021
func TestParseRemoteURL(t *testing.T) {
2122
dir, err := parseRemoteURL("git://github.com/user/repo.git")
2223
assert.NilError(t, err)
23-
assert.Check(t, len(dir) != 0)
24-
assert.Check(t, is.DeepEqual(gitRepo{"git://github.com/user/repo.git", "master", ""}, dir))
24+
assert.Check(t, is.DeepEqual(gitRepo{"git://github.com/user/repo.git", "master", ""}, dir, cmpGitRepoOpt))
2525

2626
dir, err = parseRemoteURL("git://github.com/user/repo.git#mybranch:mydir/mysubdir/")
2727
assert.NilError(t, err)
28-
assert.Check(t, len(dir) != 0)
29-
assert.Check(t, is.DeepEqual(gitRepo{"git://github.com/user/repo.git", "mybranch", "mydir/mysubdir/"}, dir))
28+
assert.Check(t, is.DeepEqual(gitRepo{"git://github.com/user/repo.git", "mybranch", "mydir/mysubdir/"}, dir, cmpGitRepoOpt))
3029

3130
dir, err = parseRemoteURL("https://github.com/user/repo.git")
3231
assert.NilError(t, err)
33-
assert.Check(t, len(dir) != 0)
34-
assert.Check(t, is.DeepEqual(gitRepo{"https://github.com/user/repo.git", "master", ""}, dir))
32+
assert.Check(t, is.DeepEqual(gitRepo{"https://github.com/user/repo.git", "master", ""}, dir, cmpGitRepoOpt))
3533

3634
dir, err = parseRemoteURL("https://github.com/user/repo.git#mybranch:mydir/mysubdir/")
3735
assert.NilError(t, err)
38-
assert.Check(t, len(dir) != 0)
39-
assert.Check(t, is.DeepEqual(gitRepo{"https://github.com/user/repo.git", "mybranch", "mydir/mysubdir/"}, dir))
36+
assert.Check(t, is.DeepEqual(gitRepo{"https://github.com/user/repo.git", "mybranch", "mydir/mysubdir/"}, dir, cmpGitRepoOpt))
4037

4138
dir, err = parseRemoteURL("[email protected]:user/repo.git")
4239
assert.NilError(t, err)
43-
assert.Check(t, len(dir) != 0)
44-
assert.Check(t, is.DeepEqual(gitRepo{"[email protected]:user/repo.git", "master", ""}, dir))
40+
assert.Check(t, is.DeepEqual(gitRepo{"[email protected]:user/repo.git", "master", ""}, dir, cmpGitRepoOpt))
4541

4642
dir, err = parseRemoteURL("[email protected]:user/repo.git#mybranch:mydir/mysubdir/")
4743
assert.NilError(t, err)
48-
assert.Check(t, len(dir) != 0)
49-
assert.Check(t, is.DeepEqual(gitRepo{"[email protected]:user/repo.git", "mybranch", "mydir/mysubdir/"}, dir))
44+
assert.Check(t, is.DeepEqual(gitRepo{"[email protected]:user/repo.git", "mybranch", "mydir/mysubdir/"}, dir, cmpGitRepoOpt))
5045
}
5146

47+
var cmpGitRepoOpt = cmp.AllowUnexported(gitRepo{})
48+
5249
func TestCloneArgsSmartHttp(t *testing.T) {
5350
mux := http.NewServeMux()
5451
server := httptest.NewServer(mux)

‎client/client_test.go‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ func TestNewEnvClient(t *testing.T) {
8989
env.PatchAll(t, c.envs)
9090
apiclient, err := NewEnvClient()
9191
if c.expectedError != "" {
92-
assert.Check(t, is.ErrorContains(err, ""), c.doc)
93-
assert.Check(t, is.Equal(c.expectedError, err.Error()), c.doc)
92+
assert.Check(t, is.Error(err, c.expectedError), c.doc)
9493
} else {
9594
assert.Check(t, err, c.doc)
9695
version := apiclient.ClientVersion()
@@ -100,7 +99,7 @@ func TestNewEnvClient(t *testing.T) {
10099
if c.envs["DOCKER_TLS_VERIFY"] != "" {
101100
// pedantic checking that this is handled correctly
102101
tr := apiclient.client.Transport.(*http.Transport)
103-
assert.Check(t, tr.TLSClientConfig != nil, c.doc)
102+
assert.Assert(t, tr.TLSClientConfig != nil, c.doc)
104103
assert.Check(t, is.Equal(tr.TLSClientConfig.InsecureSkipVerify, false), c.doc)
105104
}
106105
}
@@ -298,7 +297,7 @@ func TestClientRedirect(t *testing.T) {
298297

299298
cases := []struct {
300299
httpMethod string
301-
expectedErr error
300+
expectedErr *url.Error
302301
statusCode int
303302
}{
304303
{http.MethodGet, nil, 301},
@@ -311,7 +310,13 @@ func TestClientRedirect(t *testing.T) {
311310
req, err := http.NewRequest(tc.httpMethod, "/redirectme", nil)
312311
assert.Check(t, err)
313312
resp, err := client.Do(req)
314-
assert.Check(t, is.DeepEqual(tc.expectedErr, err))
315313
assert.Check(t, is.Equal(tc.statusCode, resp.StatusCode))
314+
if tc.expectedErr == nil {
315+
assert.Check(t, is.Nil(err))
316+
} else {
317+
urlError, ok := err.(*url.Error)
318+
assert.Assert(t, ok, "%T is not *url.Error", err)
319+
assert.Check(t, is.Equal(*tc.expectedErr, *urlError))
320+
}
316321
}
317322
}

‎daemon/graphdriver/graphtest/graphtest_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/docker/docker/daemon/graphdriver"
1616
"github.com/docker/docker/daemon/graphdriver/quota"
1717
"github.com/docker/docker/pkg/stringid"
18-
"github.com/docker/go-units"
18+
units "github.com/docker/go-units"
1919
"github.com/gotestyourself/gotestyourself/assert"
2020
is "github.com/gotestyourself/gotestyourself/assert/cmp"
2121
"golang.org/x/sys/unix"

‎daemon/graphdriver/quota/projectquota_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,5 @@ func testRetrieveQuota(t *testing.T, ctrl *Control, homeDir, testDir, testSubDir
148148

149149
var q Quota
150150
assert.NilError(t, ctrl.GetQuota(testSubDir, &q))
151-
assert.Check(t, is.Equal(testQuotaSize, q.Size))
151+
assert.Check(t, is.Equal(uint64(testQuotaSize), q.Size))
152152
}

‎daemon/logger/adapter_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func TestAdapterReadLogs(t *testing.T) {
121121
}
122122

123123
lr, ok := l.(LogReader)
124-
assert.Check(t, ok != nil)
124+
assert.Check(t, ok, "Logger does not implement LogReader")
125125

126126
lw := lr.ReadLogs(ReadConfig{})
127127

@@ -158,7 +158,7 @@ func TestAdapterReadLogs(t *testing.T) {
158158

159159
select {
160160
case msg, ok := <-lw.Msg:
161-
assert.Check(t, ok != nil, "message channel unexpectedly closed")
161+
assert.Check(t, ok, "message channel unexpectedly closed")
162162
testMessageEqual(t, &x, msg)
163163
case <-time.After(10 * time.Second):
164164
t.Fatal("timeout reading logs")

‎daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package jsonlog // import "github.com/docker/docker/daemon/logger/jsonfilelog/js
33
import (
44
"bytes"
55
"encoding/json"
6+
"fmt"
67
"regexp"
78
"testing"
89
"time"
@@ -35,7 +36,16 @@ func TestJSONLogsMarshalJSONBuf(t *testing.T) {
3536
var buf bytes.Buffer
3637
err := jsonLog.MarshalJSONBuf(&buf)
3738
assert.NilError(t, err)
38-
assert.Regexp(t, regexp.MustCompile(expression), buf.String())
39-
assert.Check(t, json.Unmarshal(buf.Bytes(), &map[string]interface{}{}))
39+
40+
assert.Assert(t, regexP(buf.String(), expression))
41+
assert.NilError(t, json.Unmarshal(buf.Bytes(), &map[string]interface{}{}))
42+
}
43+
}
44+
45+
func regexP(value string, pattern string) func() (bool, string) {
46+
return func() (bool, string) {
47+
re := regexp.MustCompile(pattern)
48+
msg := fmt.Sprintf("%q did not match pattern %q", value, pattern)
49+
return re.MatchString(value), msg
4050
}
4151
}

‎image/image_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"github.com/docker/docker/api/types/container"
1111
"github.com/docker/docker/layer"
12+
"github.com/google/go-cmp/cmp"
1213
"github.com/gotestyourself/gotestyourself/assert"
1314
is "github.com/gotestyourself/gotestyourself/assert/cmp"
1415
)
@@ -119,6 +120,6 @@ func TestNewChildImageFromImageWithRootFS(t *testing.T) {
119120
assert.Check(t, is.Len(newImage.History, 2))
120121
assert.Check(t, is.Equal(childConfig.Comment, newImage.History[1].Comment))
121122

122-
// RootFS should be copied not mutated
123-
assert.Check(t, parent.RootFS.DiffIDs != newImage.RootFS.DiffIDs)
123+
assert.Check(t, !cmp.Equal(parent.RootFS.DiffIDs, newImage.RootFS.DiffIDs),
124+
"RootFS should be copied not mutated")
124125
}

0 commit comments

Comments
 (0)