Browse code
rm-gocheck: DeepEquals -> assert.DeepEqual
sed -E -i 's#\bassert\.Assert\(c, (.*), checker\.DeepEquals, (.*)#assert.DeepEqual(c, \1, \2#g' \
-- "integration-cli/docker_cli_daemon_test.go" "pkg/discovery/discovery_test.go" "pkg/discovery/file/file_test.go" "pkg/discovery/kv/kv_test.go" "pkg/discovery/memory/memory_test.go"
Signed-off-by: Tibor Vass <tibor@docker.com>
Tibor Vass authored on 2019/09/10 06:05:57Showing 5 changed files
- integration-cli/docker_cli_daemon_test.go
- pkg/discovery/discovery_test.go
- pkg/discovery/file/file_test.go
- pkg/discovery/kv/kv_test.go
- pkg/discovery/memory/memory_test.go
| ... | ... |
@@ -1727,7 +1727,7 @@ func (s *DockerDaemonSuite) TestDaemonStartWithDefaultTLSHost(c *testing.T) {
|
| 1727 | 1727 |
|
| 1728 | 1728 |
assert.Assert(c, certRequestInfo, checker.NotNil) |
| 1729 | 1729 |
assert.Assert(c, certRequestInfo.AcceptableCAs, checker.HasLen, 1) |
| 1730 |
- assert.Assert(c, certRequestInfo.AcceptableCAs[0], checker.DeepEquals, rootCert.RawSubject) |
|
| 1730 |
+ assert.DeepEqual(c, certRequestInfo.AcceptableCAs[0], rootCert.RawSubject) |
|
| 1731 | 1731 |
} |
| 1732 | 1732 |
|
| 1733 | 1733 |
func (s *DockerDaemonSuite) TestBridgeIPIsExcludedFromAllocatorPool(c *testing.T) {
|
| ... | ... |
@@ -52,7 +52,7 @@ func (s *DiscoverySuite) TestParse(c *testing.T) {
|
| 52 | 52 |
|
| 53 | 53 |
func (s *DiscoverySuite) TestCreateEntries(c *testing.T) {
|
| 54 | 54 |
entries, err := CreateEntries(nil) |
| 55 |
- assert.Assert(c, entries, checker.DeepEquals, Entries{})
|
|
| 55 |
+ assert.DeepEqual(c, entries, Entries{})
|
|
| 56 | 56 |
assert.Assert(c, err, checker.IsNil) |
| 57 | 57 |
|
| 58 | 58 |
entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", "[2001:db8:0:f101::2]:2375", ""})
|
| ... | ... |
@@ -95,7 +95,7 @@ func (s *DiscoverySuite) TestWatch(c *testing.T) {
|
| 95 | 95 |
|
| 96 | 96 |
// Write the file and make sure we get the expected value back. |
| 97 | 97 |
assert.Assert(c, ioutil.WriteFile(tmp.Name(), []byte(data), 0600), checker.IsNil) |
| 98 |
- assert.Assert(c, <-ch, checker.DeepEquals, expected) |
|
| 98 |
+ assert.DeepEqual(c, <-ch, expected) |
|
| 99 | 99 |
|
| 100 | 100 |
// Add a new entry and look it up. |
| 101 | 101 |
expected = append(expected, &discovery.Entry{Host: "3.3.3.3", Port: "3333"})
|
| ... | ... |
@@ -105,7 +105,7 @@ func (s *DiscoverySuite) TestWatch(c *testing.T) {
|
| 105 | 105 |
_, err = f.WriteString("\n3.3.3.3:3333\n")
|
| 106 | 106 |
assert.Assert(c, err, checker.IsNil) |
| 107 | 107 |
f.Close() |
| 108 |
- assert.Assert(c, <-ch, checker.DeepEquals, expected) |
|
| 108 |
+ assert.DeepEqual(c, <-ch, expected) |
|
| 109 | 109 |
|
| 110 | 110 |
// Stop and make sure it closes all channels. |
| 111 | 111 |
close(stopCh) |
| ... | ... |
@@ -239,13 +239,13 @@ func (ds *DiscoverySuite) TestWatch(c *testing.T) {
|
| 239 | 239 |
|
| 240 | 240 |
// Push the entries into the store channel and make sure discovery emits. |
| 241 | 241 |
mockCh <- kvs |
| 242 |
- assert.Assert(c, <-ch, checker.DeepEquals, expected) |
|
| 242 |
+ assert.DeepEqual(c, <-ch, expected) |
|
| 243 | 243 |
|
| 244 | 244 |
// Add a new entry. |
| 245 | 245 |
expected = append(expected, &discovery.Entry{Host: "3.3.3.3", Port: "3333"})
|
| 246 | 246 |
kvs = append(kvs, &store.KVPair{Key: path.Join("path", defaultDiscoveryPath, "3.3.3.3"), Value: []byte("3.3.3.3:3333")})
|
| 247 | 247 |
mockCh <- kvs |
| 248 |
- assert.Assert(c, <-ch, checker.DeepEquals, expected) |
|
| 248 |
+ assert.DeepEqual(c, <-ch, expected) |
|
| 249 | 249 |
|
| 250 | 250 |
close(mockCh) |
| 251 | 251 |
// Give it enough time to call WatchTree. |
| ... | ... |
@@ -31,7 +31,7 @@ func (s *discoverySuite) TestWatch(c *testing.T) {
|
| 31 | 31 |
} |
| 32 | 32 |
|
| 33 | 33 |
assert.Assert(c, d.Register("1.1.1.1:1111"), checker.IsNil)
|
| 34 |
- assert.Assert(c, <-ch, checker.DeepEquals, expected) |
|
| 34 |
+ assert.DeepEqual(c, <-ch, expected) |
|
| 35 | 35 |
|
| 36 | 36 |
expected = discovery.Entries{
|
| 37 | 37 |
&discovery.Entry{Host: "1.1.1.1", Port: "1111"},
|
| ... | ... |
@@ -39,7 +39,7 @@ func (s *discoverySuite) TestWatch(c *testing.T) {
|
| 39 | 39 |
} |
| 40 | 40 |
|
| 41 | 41 |
assert.Assert(c, d.Register("2.2.2.2:2222"), checker.IsNil)
|
| 42 |
- assert.Assert(c, <-ch, checker.DeepEquals, expected) |
|
| 42 |
+ assert.DeepEqual(c, <-ch, expected) |
|
| 43 | 43 |
|
| 44 | 44 |
// Stop and make sure it closes all channels. |
| 45 | 45 |
close(stopCh) |