mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

rm-gocheck: normalize to use checker

Browse Source 
sed -E -i 's#\bcheck\.(Equals|DeepEquals|HasLen|IsNil|Matches|Not|NotNil)\b#checker.\1#g' \
-- "integration-cli/docker_api_containers_test.go" "integration-cli/docker_cli_attach_test.go" "integration-cli/docker_cli_attach_unix_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_external_volume_driver_unix_test.go" "integration-cli/docker_cli_health_test.go" "integration-cli/docker_cli_images_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_netmode_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_cli_port_test.go" "integration-cli/docker_cli_run_test.go" "integration-cli/docker_cli_run_unix_test.go" "integration-cli/docker_cli_save_load_test.go" "integration-cli/docker_cli_service_health_test.go" "integration-cli/docker_cli_swarm_test.go" "integration-cli/docker_cli_volume_test.go" "integration-cli/docker_utils_test.go" "pkg/discovery/discovery_test.go" "pkg/discovery/file/file_test.go" "pkg/discovery/generator_test.go" "pkg/discovery/kv/kv_test.go" "pkg/discovery/memory/memory_test.go" "pkg/discovery/nodes/nodes_test.go"

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass
2019-09-09 21:05:56 +00:00
parent a7d144fb34
commit 230f7bcc02
28 changed files with 347 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
integration-cli/docker_cli_build_test.go
View File

@ -4373,7 +4373,7 @@ func (s *DockerSuite) TestBuildBuildTimeArgExpansion(c *testing.T) {
)
res := inspectField(c, imgName, "Config.WorkingDir")
assert.Assert(c, filepath.ToSlash(res), check.Equals, filepath.ToSlash(wdVal))
assert.Assert(c, filepath.ToSlash(res), checker.Equals, filepath.ToSlash(wdVal))
var resArr []string
inspectFieldAndUnmarshall(c, imgName, "Config.Env", &resArr)
@ -4754,7 +4754,7 @@ func (s *DockerSuite) TestBuildMultipleTags(c *testing.T) {
id1 := getIDByName(c, "tag1")
id2 := getIDByName(c, "tag2:v2")
assert.Assert(c, id1, check.Equals, id2)
assert.Assert(c, id1, checker.Equals, id2)
}
// #17290
@ -5572,7 +5572,7 @@ func (s *DockerSuite) TestBuildNetContainer(c *testing.T) {
`))
host, _ := dockerCmd(c, "run", "testbuildnetcontainer", "cat", "/otherhost")
assert.Assert(c, strings.TrimSpace(host), check.Equals, "foobar")
assert.Assert(c, strings.TrimSpace(host), checker.Equals, "foobar")
}
func (s *DockerSuite) TestBuildWithExtraHost(c *testing.T) {
@ -5777,9 +5777,9 @@ func (s *DockerSuite) TestBuildMultiStageMultipleBuilds(c *testing.T) {
cli.BuildCmd(c, "build2", build.WithExternalBuildContext(ctx))
out := cli.DockerCmd(c, "run", "build2", "cat", "bar").Combined()
assert.Assert(c, strings.TrimSpace(out), check.Equals, "abc")
assert.Assert(c, strings.TrimSpace(out), checker.Equals, "abc")
out = cli.DockerCmd(c, "run", "build2", "cat", "foo").Combined()
assert.Assert(c, strings.TrimSpace(out), check.Equals, "def")
assert.Assert(c, strings.TrimSpace(out), checker.Equals, "def")
}
func (s *DockerSuite) TestBuildMultiStageImplicitFrom(c *testing.T) {
@ -5893,9 +5893,9 @@ func (s *DockerSuite) TestBuildMultiStageMultipleBuildsWindows(c *testing.T) {
cli.BuildCmd(c, "build2", build.WithExternalBuildContext(ctx))
out := cli.DockerCmd(c, "run", "build2", "cmd.exe", "/s", "/c", "type", "c:\\bar").Combined()
assert.Assert(c, strings.TrimSpace(out), check.Equals, "abc")
assert.Assert(c, strings.TrimSpace(out), checker.Equals, "abc")
out = cli.DockerCmd(c, "run", "build2", "cmd.exe", "/s", "/c", "type", "c:\\foo").Combined()
assert.Assert(c, strings.TrimSpace(out), check.Equals, "def")
assert.Assert(c, strings.TrimSpace(out), checker.Equals, "def")
}
func (s *DockerSuite) TestBuildCopyFromForbidWindowsSystemPaths(c *testing.T) {
@ -6223,5 +6223,5 @@ func (s *DockerSuite) TestBuildIidFileCleanupOnFail(c *testing.T) {
})
_, err = os.Stat(tmpIidFile)
assert.ErrorContains(c, err, "")
assert.Assert(c, os.IsNotExist(err), check.Equals, true)
assert.Assert(c, os.IsNotExist(err), checker.Equals, true)
}