InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration-cli: TestUserDefinedNetworkAlias: replace deprecated utils

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-12-04 13:27:48 +01:00
parent 83f17f77cf
commit 93eb7962dc
1 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
integration-cli/docker_cli_run_test.go
View File

@@ -300,48 +300,45 @@ func (s *DockerCLIRunSuite) TestRunWithNetAliasOnDefaultNetworks(c *testing.T) {
} }
func (s *DockerCLIRunSuite) TestUserDefinedNetworkAlias(c *testing.T) { func (s *DockerCLIRunSuite) TestUserDefinedNetworkAlias(c *testing.T) {
testRequires(c, DaemonIsLinux, NotUserNamespace) t := c
cli.DockerCmd(c, "network", "create", "-d", "bridge", "net1") testRequires(t, DaemonIsLinux, NotUserNamespace)
cli.DockerCmd(t, "network", "create", "-d", "bridge", "net1")
cid1 := cli.DockerCmd(c, "run", "-d", "--net=net1", "--name=first", "--net-alias=foo1", "--net-alias=foo2", "busybox:glibc", "top").Stdout() cid1 := cli.DockerCmd(t, "run", "-d", "--net=net1", "--name=first", "--net-alias=foo1", "--net-alias=foo2", "busybox:glibc", "top").Stdout()
cli.WaitRun(c, "first") cid1 = strings.TrimSpace(cid1)
cli.WaitRun(t, "first")
// Check if default short-id alias is added automatically // Check if default short-id alias is added automatically
id := strings.TrimSpace(cid1) aliases := cli.DockerCmd(t, "container", "inspect", "--format", "{{.NetworkSettings.Networks.net1.Aliases}}", cid1).Stdout()
aliases := inspectField(c, id, "NetworkSettings.Networks.net1.Aliases") assert.Assert(t, is.Contains(aliases, stringid.TruncateID(cid1)))
assert.Assert(c, is.Contains(aliases, stringid.TruncateID(id))) assert.Assert(t, is.Contains(aliases, "foo1"))
cid2 := cli.DockerCmd(c, "run", "-d", "--net=net1", "--name=second", "busybox:glibc", "top").Stdout() assert.Assert(t, is.Contains(aliases, "foo2"))
cli.WaitRun(c, "second")
cid2 := cli.DockerCmd(t, "run", "-d", "--net=net1", "--name=second", "busybox:glibc", "top").Stdout()
cid2 = strings.TrimSpace(cid2)
cli.WaitRun(t, "second")
// Check if default short-id alias is added automatically // Check if default short-id alias is added automatically
id = strings.TrimSpace(cid2) aliases = cli.DockerCmd(t, "container", "inspect", "--format", "{{.NetworkSettings.Networks.net1.Aliases}}", cid2).Stdout()
aliases = inspectField(c, id, "NetworkSettings.Networks.net1.Aliases") assert.Assert(t, is.Contains(aliases, stringid.TruncateID(cid2)))
assert.Assert(c, is.Contains(aliases, stringid.TruncateID(id)))
// ping to first and its network-scoped aliases // ping to first and its network-scoped aliases
_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first") cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", "first")
assert.NilError(c, err) cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", "foo1")
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo1") cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", "foo2")
assert.NilError(c, err)
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo2")
assert.NilError(c, err)
// ping first container's short-id alias // ping first container's short-id alias
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", stringid.TruncateID(cid1)) cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", stringid.TruncateID(cid1))
assert.NilError(c, err)
// Restart first container // Restart first container
cli.DockerCmd(c, "restart", "first") cli.DockerCmd(t, "restart", "first")
cli.WaitRun(c, "first") cli.WaitRun(t, "first")
// ping to first and its network-scoped aliases must succeed // ping to first and its network-scoped aliases must succeed
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first") cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", "first")
assert.NilError(c, err) cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", "foo1")
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo1") cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", "foo2")
assert.NilError(c, err)
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo2")
assert.NilError(c, err)
// ping first container's short-id alias // ping first container's short-id alias
_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", stringid.TruncateID(cid1)) cli.DockerCmd(t, "exec", "second", "ping", "-c", "1", stringid.TruncateID(cid1))
assert.NilError(c, err)
} }
// Issue 9677. // Issue 9677.