diff --git a/integration-cli/docker_cli_netmode_test.go b/integration-cli/docker_cli_netmode_test.go index 6877d9d829..80ba1374f1 100644 --- a/integration-cli/docker_cli_netmode_test.go +++ b/integration-cli/docker_cli_netmode_test.go @@ -29,12 +29,11 @@ func (s *DockerCLINetmodeSuite) OnTimeout(c *testing.T) { } // DockerCmdWithFail executes a docker command that is supposed to fail and returns -// the output, the exit code. If the command returns a Nil error, it will fail and -// stop the tests. -func dockerCmdWithFail(c *testing.T, args ...string) (string, int) { - out, status, err := dockerCmdWithError(args...) +// the output. If the command returns a Nil error, it will fail and stop the tests. +func dockerCmdWithFail(c *testing.T, args ...string) string { + out, _, err := dockerCmdWithError(args...) assert.Assert(c, err != nil, "%v", out) - return out, status + return out } func (s *DockerCLINetmodeSuite) TestNetHostnameWithNetHost(c *testing.T) { @@ -53,48 +52,48 @@ func (s *DockerCLINetmodeSuite) TestNetHostname(c *testing.T) { assert.Assert(c, strings.Contains(out, stringCheckPS)) out = cli.DockerCmd(c, "run", "-h=name", "--net=none", "busybox", "ps").Stdout() assert.Assert(c, strings.Contains(out, stringCheckPS)) - out, _ = dockerCmdWithFail(c, "run", "-h=name", "--net=container:other", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "-h=name", "--net=container:other", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictNetworkHostname.Error())) - out, _ = dockerCmdWithFail(c, "run", "--net=container", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=container", "busybox", "ps") assert.Assert(c, strings.Contains(out, "invalid container format container:")) - out, _ = dockerCmdWithFail(c, "run", "--net=weird", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=weird", "busybox", "ps") assert.Assert(c, strings.Contains(strings.ToLower(out), "not found")) } func (s *DockerCLINetmodeSuite) TestConflictContainerNetworkAndLinks(c *testing.T) { testRequires(c, DaemonIsLinux) - out, _ := dockerCmdWithFail(c, "run", "--net=container:other", "--link=zip:zap", "busybox", "ps") + out := dockerCmdWithFail(c, "run", "--net=container:other", "--link=zip:zap", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictContainerNetworkAndLinks.Error())) } func (s *DockerCLINetmodeSuite) TestConflictContainerNetworkHostAndLinks(c *testing.T) { testRequires(c, DaemonIsLinux, NotUserNamespace) - out, _ := dockerCmdWithFail(c, "run", "--net=host", "--link=zip:zap", "busybox", "ps") + out := dockerCmdWithFail(c, "run", "--net=host", "--link=zip:zap", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictHostNetworkAndLinks.Error())) } func (s *DockerCLINetmodeSuite) TestConflictNetworkModeNetHostAndOptions(c *testing.T) { testRequires(c, DaemonIsLinux, NotUserNamespace) - out, _ := dockerCmdWithFail(c, "run", "--net=host", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps") + out := dockerCmdWithFail(c, "run", "--net=host", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictContainerNetworkAndMac.Error())) } func (s *DockerCLINetmodeSuite) TestConflictNetworkModeAndOptions(c *testing.T) { testRequires(c, DaemonIsLinux) - out, _ := dockerCmdWithFail(c, "run", "--net=container:other", "--dns=8.8.8.8", "busybox", "ps") + out := dockerCmdWithFail(c, "run", "--net=container:other", "--dns=8.8.8.8", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictNetworkAndDNS.Error())) - out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--add-host=name:8.8.8.8", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=container:other", "--add-host=name:8.8.8.8", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictNetworkHosts.Error())) - out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=container:other", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictContainerNetworkAndMac.Error())) - out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "-P", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=container:other", "-P", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error())) - out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "-p", "8080", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=container:other", "-p", "8080", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error())) - out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--expose", "8000-9000", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "--net=container:other", "--expose", "8000-9000", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictNetworkExposePorts.Error())) } diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 0487a60a7c..f72a8bb70e 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2450,7 +2450,7 @@ func (s *DockerCLIRunSuite) TestRunModeUTSHost(c *testing.T) { c.Fatalf("UTS should be different without --uts=host %s == %s\n", hostUTS, out) } - out, _ = dockerCmdWithFail(c, "run", "-h=name", "--uts=host", "busybox", "ps") + out = dockerCmdWithFail(c, "run", "-h=name", "--uts=host", "busybox", "ps") assert.Assert(c, strings.Contains(out, runconfig.ErrConflictUTSHostname.Error())) }