mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

Use testEnv methods and remove most of the global variables

Browse Source 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester
2017-01-13 17:23:28 +01:00
parent a7c3389a82
commit c8016e669f
40 changed files with 180 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration-cli/docker_cli_create_test.go
View File

@ -58,7 +58,7 @@ func (s *DockerSuite) TestCreateArgs(c *check.C) {
// Make sure we can grow the container's rootfs at creation time.
func (s *DockerSuite) TestCreateGrowRootfs(c *check.C) {
// Windows and Devicemapper support growing the rootfs
if daemonPlatform != "windows" {
if testEnv.DaemonPlatform() != "windows" {
testRequires(c, Devicemapper)
}
out, _ := dockerCmd(c, "create", "--storage-opt", "size=120G", "busybox")
@ -226,8 +226,8 @@ func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {
func (s *DockerSuite) TestCreateHostnameWithNumber(c *check.C) {
image := "busybox"
// Busybox on Windows does not implement hostname command
if daemonPlatform == "windows" {
image = WindowsBaseImage
if testEnv.DaemonPlatform() == "windows" {
image = testEnv.MinimalBaseImage()
}
out, _ := dockerCmd(c, "run", "-h", "web.0", image, "hostname")
c.Assert(strings.TrimSpace(out), checker.Equals, "web.0", check.Commentf("hostname not set, expected `web.0`, got: %s", out))
@ -411,7 +411,7 @@ func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {
dockerCmd(c, "create", "--name", name, "-w", dir, "busybox")
// Windows does not create the workdir until the container is started
if daemonPlatform == "windows" {
if testEnv.DaemonPlatform() == "windows" {
dockerCmd(c, "start", name)
}
dockerCmd(c, "cp", fmt.Sprintf("%s:%s", name, dir), prefix+slash+"tmp")