docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test 

refactor docker_cli_netmode_test .go with Assert statement
This commit is contained in:
Antonio Murdaca 2015-11-01 11:07:54 +01:00
parent 4468e1e74e a9c7c48cca
commit 29c9717cac
1 changed files with 46 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
integration-cli/docker_cli_netmode_test.go
View File

@ -1,9 +1,7 @@
package main package main
import ( import (
"os/exec" "github.com/docker/docker/pkg/integration/checker"
"strings"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
"github.com/go-check/check" "github.com/go-check/check"
) )
@ -14,152 +12,80 @@ import (
// the command executed in a container did really run PS correctly. // the command executed in a container did really run PS correctly.
const stringCheckPS = "PID USER" const stringCheckPS = "PID USER"
// checkContains is a helper function that validates a command output did // DockerCmdWithFail executes a docker command that is supposed to fail and returns
// contain what was expected. // the output, the exit code. If the command returns an Nil error, it will fail and
func checkContains(expected string, out string, c *check.C) { // stop the tests.
if !strings.Contains(out, expected) { func dockerCmdWithFail(c *check.C, args ...string) (string, int) {
c.Fatalf("Expected '%s', got '%s'", expected, out) out, status, err := dockerCmdWithError(args...)
} c.Assert(err, check.NotNil, check.Commentf("%v", out))
return out, status
} }
func (s *DockerSuite) TestNetHostname(c *check.C) { func (s *DockerSuite) TestNetHostname(c *check.C) {
testRequires(c, DaemonIsLinux, NotUserNamespace) testRequires(c, DaemonIsLinux, NotUserNamespace)
var ( out, _ := dockerCmd(c, "run", "-h=name", "busybox", "ps")
out string c.Assert(out, checker.Contains, stringCheckPS)
err error
runCmd *exec.Cmd
)
runCmd = exec.Command(dockerBinary, "run", "-h=name", "busybox", "ps") out, _ = dockerCmd(c, "run", "--net=host", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err != nil { c.Assert(out, checker.Contains, stringCheckPS)
c.Fatalf(out, err)
}
checkContains(stringCheckPS, out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=host", "busybox", "ps") out, _ = dockerCmd(c, "run", "-h=name", "--net=bridge", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err != nil { c.Assert(out, checker.Contains, stringCheckPS)
c.Fatalf(out, err)
}
checkContains(stringCheckPS, out, c)
runCmd = exec.Command(dockerBinary, "run", "-h=name", "--net=bridge", "busybox", "ps") out, _ = dockerCmd(c, "run", "-h=name", "--net=none", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err != nil { c.Assert(out, checker.Contains, stringCheckPS)
c.Fatalf(out, err)
}
checkContains(stringCheckPS, out, c)
runCmd = exec.Command(dockerBinary, "run", "-h=name", "--net=none", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "-h=name", "--net=host", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err != nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHostname.Error())
c.Fatalf(out, err)
}
checkContains(stringCheckPS, out, c)
runCmd = exec.Command(dockerBinary, "run", "-h=name", "--net=host", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "-h=name", "--net=container:other", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHostname.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkHostname.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "-h=name", "--net=container:other", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=container", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, "--net: invalid net mode: invalid container format container:<name|id>")
c.Fatalf(out, err, c)
}
checkContains(runconfig.ErrConflictNetworkHostname.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=container", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=weird", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, "network weird not found")
c.Fatalf(out, err, c)
}
checkContains("--net: invalid net mode: invalid container format container:<name|id>", out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=weird", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil {
c.Fatalf(out, err)
}
checkContains("network weird not found", out, c)
} }
func (s *DockerSuite) TestConflictContainerNetworkAndLinks(c *check.C) { func (s *DockerSuite) TestConflictContainerNetworkAndLinks(c *check.C) {
testRequires(c, DaemonIsLinux, NotUserNamespace) testRequires(c, DaemonIsLinux, NotUserNamespace)
var (
out string
err error
runCmd *exec.Cmd
)
runCmd = exec.Command(dockerBinary, "run", "--net=container:other", "--link=zip:zap", "busybox", "ps") out, _ := dockerCmdWithFail(c, "run", "--net=container:other", "--link=zip:zap", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictContainerNetworkAndLinks.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictContainerNetworkAndLinks.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=host", "--link=zip:zap", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=host", "--link=zip:zap", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictHostNetworkAndLinks.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictHostNetworkAndLinks.Error(), out, c)
} }
func (s *DockerSuite) TestConflictNetworkModeAndOptions(c *check.C) { func (s *DockerSuite) TestConflictNetworkModeAndOptions(c *check.C) {
testRequires(c, DaemonIsLinux, NotUserNamespace) testRequires(c, DaemonIsLinux, NotUserNamespace)
var (
out string
err error
runCmd *exec.Cmd
)
runCmd = exec.Command(dockerBinary, "run", "--net=host", "--dns=8.8.8.8", "busybox", "ps") out, _ := dockerCmdWithFail(c, "run", "--net=host", "--dns=8.8.8.8", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkAndDNS.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkAndDNS.Error(), out, c)
runCmd = exec.Command(dockerBinary, "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")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkAndDNS.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkAndDNS.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=host", "--add-host=name:8.8.8.8", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=host", "--add-host=name:8.8.8.8", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHosts.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkHosts.Error(), out, c)
runCmd = exec.Command(dockerBinary, "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")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHosts.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkHosts.Error(), out, c)
runCmd = exec.Command(dockerBinary, "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")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictContainerNetworkAndMac.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictContainerNetworkAndMac.Error(), out, c)
runCmd = exec.Command(dockerBinary, "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")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictContainerNetworkAndMac.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictContainerNetworkAndMac.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=container:other", "-P", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "-P", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkPublishPorts.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkPublishPorts.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=container:other", "-p", "8080", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "-p", "8080", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkPublishPorts.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkPublishPorts.Error(), out, c)
runCmd = exec.Command(dockerBinary, "run", "--net=container:other", "--expose", "8000-9000", "busybox", "ps") out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--expose", "8000-9000", "busybox", "ps")
if out, _, err = runCommandWithOutput(runCmd); err == nil { c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkExposePorts.Error())
c.Fatalf(out, err)
}
checkContains(runconfig.ErrConflictNetworkExposePorts.Error(), out, c)
} }