mirror of
https://github.com/moby/moby.git
synced 2025-07-29 07:21:35 +03:00
rm-gocheck: Not(Contains) -> !strings.Contains
sed -E -i 's#\bassert\.Assert\(c, (.*), checker\.Not\(checker\.Contains\), (.*)\)$#assert.Assert(c, !eg_contains(\1, \2))#g' \ -- "integration-cli/docker_cli_build_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_images_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_cli_plugins_test.go" "integration-cli/docker_cli_prune_unix_test.go" "integration-cli/docker_cli_ps_test.go" "integration-cli/docker_cli_pull_local_test.go" "integration-cli/docker_cli_rmi_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_start_test.go" "integration-cli/docker_cli_swarm_test.go" "integration-cli/docker_cli_volume_test.go" \ && \ go get -d golang.org/x/tools/cmd/eg && dir=$(go env GOPATH)/src/golang.org/x/tools && git -C "$dir" fetch https://github.com/tiborvass/tools handle-variadic && git -C "$dir" checkout 61a94b82347c29b3289e83190aa3dda74d47abbb && go install golang.org/x/tools/cmd/eg \ && \ /bin/echo -e 'package main\nvar eg_contains func(arg1, arg2 string, extra ...interface{}) bool' > ./integration-cli/eg_helper.go \ && \ goimports -w ./integration-cli \ && \ eg -w -t template.not_contains.go -- ./integration-cli \ && \ rm -f ./integration-cli/eg_helper.go \ && \ go run rm-gocheck.go redress '\bassert\.Assert\b.*(\(|,)\s*$' \ "integration-cli/docker_cli_build_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_images_test.go" "integration-cli/docker_cli_inspect_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_cli_plugins_test.go" "integration-cli/docker_cli_prune_unix_test.go" "integration-cli/docker_cli_ps_test.go" "integration-cli/docker_cli_pull_local_test.go" "integration-cli/docker_cli_rmi_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_start_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:
@ -97,8 +97,7 @@ func (s *DockerDaemonSuite) TestPruneImageDangling(c *testing.T) {
|
||||
|
||||
out, err = s.d.Cmd("image", "prune", "--force")
|
||||
assert.NilError(c, err)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id))
|
||||
out, err = s.d.Cmd("images", "-q", "--no-trunc")
|
||||
assert.NilError(c, err)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id)
|
||||
@ -109,7 +108,7 @@ func (s *DockerDaemonSuite) TestPruneImageDangling(c *testing.T) {
|
||||
|
||||
out, err = s.d.Cmd("images", "-q", "--no-trunc")
|
||||
assert.NilError(c, err)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id))
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestPruneContainerUntil(c *testing.T) {
|
||||
@ -125,10 +124,9 @@ func (s *DockerSuite) TestPruneContainerUntil(c *testing.T) {
|
||||
|
||||
out = cli.DockerCmd(c, "container", "prune", "--force", "--filter", "until="+until).Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
out = cli.DockerCmd(c, "ps", "-a", "-q", "--no-trunc").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
}
|
||||
|
||||
@ -159,35 +157,33 @@ func (s *DockerSuite) TestPruneContainerLabel(c *testing.T) {
|
||||
|
||||
// With config.json only, prune based on label=foobar
|
||||
out = cli.DockerCmd(c, "--config", d, "container", "prune", "--force").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id3)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id3))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id4)
|
||||
|
||||
out = cli.DockerCmd(c, "container", "prune", "--force", "--filter", "label=foo").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id3)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id3))
|
||||
out = cli.DockerCmd(c, "ps", "-a", "-q", "--no-trunc").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id3)
|
||||
|
||||
out = cli.DockerCmd(c, "container", "prune", "--force", "--filter", "label!=bar").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id3)
|
||||
|
||||
out = cli.DockerCmd(c, "ps", "-a", "-q", "--no-trunc").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id3)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id3))
|
||||
// With config.json label=foobar and CLI label!=foobar, CLI label!=foobar supersede
|
||||
out = cli.DockerCmd(c, "--config", d, "container", "prune", "--force", "--filter", "label!=foobar").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
|
||||
out = cli.DockerCmd(c, "ps", "-a", "-q", "--no-trunc").Combined()
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestPruneVolumeLabel(c *testing.T) {
|
||||
@ -217,35 +213,33 @@ func (s *DockerSuite) TestPruneVolumeLabel(c *testing.T) {
|
||||
|
||||
// With config.json only, prune based on label=foobar
|
||||
out, _ = dockerCmd(c, "--config", d, "volume", "prune", "--force")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id3)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id3))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id4)
|
||||
|
||||
out, _ = dockerCmd(c, "volume", "prune", "--force", "--filter", "label=foo")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id3)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id3))
|
||||
out, _ = dockerCmd(c, "volume", "ls", "--format", "{{.Name}}")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id3)
|
||||
|
||||
out, _ = dockerCmd(c, "volume", "prune", "--force", "--filter", "label!=bar")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id3)
|
||||
|
||||
out, _ = dockerCmd(c, "volume", "ls", "--format", "{{.Name}}")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id3)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id3))
|
||||
// With config.json label=foobar and CLI label!=foobar, CLI label!=foobar supersede
|
||||
out, _ = dockerCmd(c, "--config", d, "volume", "prune", "--force", "--filter", "label!=foobar")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
|
||||
out, _ = dockerCmd(c, "volume", "ls", "--format", "{{.Name}}")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
}
|
||||
|
||||
func (s *DockerSuite) TestPruneNetworkLabel(c *testing.T) {
|
||||
@ -255,18 +249,17 @@ func (s *DockerSuite) TestPruneNetworkLabel(c *testing.T) {
|
||||
|
||||
out, _ := dockerCmd(c, "network", "prune", "--force", "--filter", "label=foo")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, "n1")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), "n2")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), "n3")
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), "n2"))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), "n3"))
|
||||
out, _ = dockerCmd(c, "network", "prune", "--force", "--filter", "label!=bar")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), "n1")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), "n2")
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), "n1"))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), "n2"))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, "n3")
|
||||
|
||||
out, _ = dockerCmd(c, "network", "prune", "--force")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), "n1")
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), "n1"))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, "n2")
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), "n3")
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), "n3"))
|
||||
}
|
||||
|
||||
func (s *DockerDaemonSuite) TestPruneImageLabel(c *testing.T) {
|
||||
@ -297,15 +290,13 @@ func (s *DockerDaemonSuite) TestPruneImageLabel(c *testing.T) {
|
||||
out, err = s.d.Cmd("image", "prune", "--force", "--all", "--filter", "label=foo=bar")
|
||||
assert.NilError(c, err)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
out, err = s.d.Cmd("image", "prune", "--force", "--all", "--filter", "label!=bar=foo")
|
||||
assert.NilError(c, err)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id2)
|
||||
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id2))
|
||||
out, err = s.d.Cmd("image", "prune", "--force", "--all", "--filter", "label=bar=foo")
|
||||
assert.NilError(c, err)
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Not(checker.Contains), id1)
|
||||
assert.Assert(c, !strings.Contains(strings.TrimSpace(out), id1))
|
||||
assert.Assert(c, strings.TrimSpace(out), checker.Contains, id2)
|
||||
}
|
||||
|
Reference in New Issue
Block a user