mirror of
https://github.com/moby/moby.git
synced 2025-10-24 09:13:09 +03:00
rm-gocheck: Not(Equals) -> a != b
sed -E -i 's#\bassert\.Assert\(c, (.*), checker\.Not\(checker\.Equals\), (.*)#assert.Assert(c, \1 != \2#g' \ -- "integration-cli/docker_api_containers_test.go" "integration-cli/docker_cli_build_test.go" "integration-cli/docker_cli_build_unix_test.go" "integration-cli/docker_cli_by_digest_test.go" "integration-cli/docker_cli_create_test.go" "integration-cli/docker_cli_daemon_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_cli_prune_unix_test.go" "integration-cli/docker_cli_ps_test.go" "integration-cli/docker_cli_run_test.go" "integration-cli/docker_cli_save_load_test.go" "integration-cli/docker_cli_service_create_test.go" "integration-cli/docker_cli_swarm_test.go" "integration-cli/docker_cli_volume_test.go" Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
@@ -1060,7 +1060,7 @@ func verifyContainerIsConnectedToNetworks(c *testing.T, d *daemon.Daemon, cName
|
||||
for _, nw := range nws {
|
||||
out, err := d.Cmd("inspect", "-f", fmt.Sprintf("{{.NetworkSettings.Networks.%s}}", nw), cName)
|
||||
assert.NilError(c, err, out)
|
||||
assert.Assert(c, out, checker.Not(checker.Equals), "<no value>\n")
|
||||
assert.Assert(c, out != "<no value>\n")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1166,7 +1166,7 @@ func verifyPortMap(c *testing.T, container, port, originalMapping string, mustBe
|
||||
if mustBeEqual {
|
||||
assert.Assert(c, currentMapping, checker.Equals, originalMapping)
|
||||
} else {
|
||||
assert.Assert(c, currentMapping, checker.Not(checker.Equals), originalMapping)
|
||||
assert.Assert(c, currentMapping != originalMapping)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1216,7 +1216,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectWithMac(c *testing.T) {
|
||||
assert.Assert(c, strings.TrimSpace(mac1), checker.Equals, macAddress)
|
||||
dockerCmd(c, "network", "connect", "mynetwork", "test")
|
||||
mac2 := inspectField(c, "test", "NetworkSettings.Networks.mynetwork.MacAddress")
|
||||
assert.Assert(c, strings.TrimSpace(mac2), checker.Not(checker.Equals), strings.TrimSpace(mac1))
|
||||
assert.Assert(c, strings.TrimSpace(mac2) != strings.TrimSpace(mac1))
|
||||
}
|
||||
|
||||
func (s *DockerNetworkSuite) TestDockerNetworkInspectCreatedContainer(c *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user