GitList

Browse code

integration-cli: get container id from stdout only

TestDaemonRestartWithNames in the DockerDaemonSuite has been broken
since commit 72ec7cd6cc193f9054d1a58b8de244bd99c1d841. The test takes
the combined output of a `docker run` command as the ID of the created
container. This works fine so long as the command emits no warnings,
otherwise it will corrupt the ID that the test captures. Modify the test
to read the ID from the command's stdout to make the test robust to
warnings being printed.

Signed-off-by: Cory Snider <csnider@mirantis.com>

Cory Snider authored on 2026/06/11 04:57:48
Showing 2 changed files

integration-cli/daemon/daemon.go index 4919c7e..1094fc2 100644
integration-cli/docker_cli_daemon_test.go index e8dd082..6098dfb 100644

integration-cli/daemon/daemon.go

History View file @ 1dd67f8

@@ -37,10 +37,16 @@ func New(t testing.TB, dockerBinary string, dockerdBinary string, ops ...daemon.
                      // Cmd executes a docker CLI command against this daemon.
                      // Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version
                      func (d *Daemon) Cmd(args ...string) (string, error) {
                     -	result := icmd.RunCmd(d.Command(args...))
                     +	result := d.RunCmd(args...)
                      	return result.Combined(), result.Error
+                     }
                     +// RunCmd executes a docker CLI command against this daemon and returns the result.
                     +// Example: d.RunCmd("version") will run docker -H unix://path/to/unix.sock version
                     +func (d *Daemon) RunCmd(args ...string) *icmd.Result {
                     +	return icmd.RunCmd(d.Command(args...))
                     +}
+                    +
                      // Command creates a docker CLI command against this daemon, to be executed later.
                      // Example: d.Command("version") creates a command to run "docker -H unix://path/to/unix.sock version"
                      func (d *Daemon) Command(args ...string) icmd.Cmd {

integration-cli/docker_cli_daemon_test.go

History View file @ 1dd67f8

@@ -1238,9 +1238,10 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithNames(c *testing.T) {
                      	assert.NilError(c, err, out)
                      	test2ID := strings.TrimSpace(out)
                     -	out, err = s.d.Cmd("run", "-d", "--name=test3", "--link", "test2:abc", "busybox", "top")
                     -	assert.NilError(c, err)
                     -	test3ID := strings.TrimSpace(out)
                     +	res := s.d.RunCmd("run", "-d", "--name=test3", "--link", "test2:abc", "busybox", "top")
                     +	assert.NilError(c, res.Error)
                     +	// Discard any warnings about legacy links, which are emitted on stderr.
                     +	test3ID := strings.TrimSpace(res.Stdout())
                      	s.d.Restart(c)