@@ -2786,3 +2786,197 @@ func (s *DockerSuite) TestRunNamedVolume(c *check.C) {

 	out, _ = dockerCmd(c, "run", "-v", "testing:/foo", "busybox", "sh", "-c", "cat /foo/bar")

 	c.Assert(strings.TrimSpace(out), check.Equals, "hello")

 }

+

+func (s *DockerSuite) TestRunWithUlimits(c *check.C) {

+	testRequires(c, NativeExecDriver)

+

+	out, _ := dockerCmd(c, "run", "--name=testulimits", "--ulimit", "nofile=42", "busybox", "/bin/sh", "-c", "ulimit -n")

+	ul := strings.TrimSpace(out)

+	if ul != "42" {

+		c.Fatalf("expected `ulimit -n` to be 42, got %s", ul)

+	}

+}

+

+func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) {

+	testRequires(c, NativeExecDriver)

+

+	cgroupParent := "test"

+	name := "cgroup-test"

+

+	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")

+	if err != nil {

+		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)

+	}

+	cgroupPaths := parseCgroupPaths(string(out))

+	if len(cgroupPaths) == 0 {

+		c.Fatalf("unexpected output - %q", string(out))

+	}

+	id, err := getIDByName(name)

+	c.Assert(err, check.IsNil)

+	expectedCgroup := path.Join(cgroupParent, id)

+	found := false

+	for _, path := range cgroupPaths {

+		if strings.HasSuffix(path, expectedCgroup) {

+			found = true

+			break

+		}

+	}

+	if !found {

+		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)

+	}

+}

+

+func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) {

+	testRequires(c, NativeExecDriver)

+

+	cgroupParent := "/cgroup-parent/test"

+	name := "cgroup-test"

+	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")

+	if err != nil {

+		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)

+	}

+	cgroupPaths := parseCgroupPaths(string(out))

+	if len(cgroupPaths) == 0 {

+		c.Fatalf("unexpected output - %q", string(out))

+	}

+	id, err := getIDByName(name)

+	c.Assert(err, check.IsNil)

+	expectedCgroup := path.Join(cgroupParent, id)

+	found := false

+	for _, path := range cgroupPaths {

+		if strings.HasSuffix(path, expectedCgroup) {

+			found = true

+			break

+		}

+	}

+	if !found {

+		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)

+	}

+}

+

+func (s *DockerSuite) TestRunContainerWithCgroupMountRO(c *check.C) {

+	testRequires(c, NativeExecDriver)

+

+	filename := "/sys/fs/cgroup/devices/test123"

+	out, _, err := dockerCmdWithError("run", "busybox", "touch", filename)

+	if err == nil {

+		c.Fatal("expected cgroup mount point to be read-only, touch file should fail")

+	}

+	expected := "Read-only file system"

+	if !strings.Contains(out, expected) {

+		c.Fatalf("expected output from failure to contain %s but contains %s", expected, out)

+	}

+}

+

+func (s *DockerSuite) TestRunContainerNetworkModeToSelf(c *check.C) {

+	out, _, err := dockerCmdWithError("run", "--name=me", "--net=container:me", "busybox", "true")

+	if err == nil || !strings.Contains(out, "cannot join own network") {

+		c.Fatalf("using container net mode to self should result in an error")

+	}

+}

+

+func (s *DockerSuite) TestRunContainerNetModeWithDnsMacHosts(c *check.C) {

+	out, _, err := dockerCmdWithError("run", "-d", "--name", "parent", "busybox", "top")

+	if err != nil {

+		c.Fatalf("failed to run container: %v, output: %q", err, out)

+	}

+

+	out, _, err = dockerCmdWithError("run", "--dns", "1.2.3.4", "--net=container:parent", "busybox")

+	if err == nil || !strings.Contains(out, "Conflicting options: --dns and the network mode") {

+		c.Fatalf("run --net=container with --dns should error out")

+	}

+

+	out, _, err = dockerCmdWithError("run", "--mac-address", "92:d0:c6:0a:29:33", "--net=container:parent", "busybox")

+	if err == nil || !strings.Contains(out, "--mac-address and the network mode") {

+		c.Fatalf("run --net=container with --mac-address should error out")

+	}

+

+	out, _, err = dockerCmdWithError("run", "--add-host", "test:192.168.2.109", "--net=container:parent", "busybox")

+	if err == nil || !strings.Contains(out, "--add-host and the network mode") {

+		c.Fatalf("run --net=container with --add-host should error out")

+	}

+}

+

+func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) {

+	dockerCmd(c, "run", "-d", "--name", "parent", "busybox", "top")

+

+	out, _, err := dockerCmdWithError("run", "-p", "5000:5000", "--net=container:parent", "busybox")

+	if err == nil || !strings.Contains(out, "Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)") {

+		c.Fatalf("run --net=container with -p should error out")

+	}

+

+	out, _, err = dockerCmdWithError("run", "-P", "--net=container:parent", "busybox")

+	if err == nil || !strings.Contains(out, "Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)") {

+		c.Fatalf("run --net=container with -P should error out")

+	}

+

+	out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox")

+	if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--expose)") {

+		c.Fatalf("run --net=container with --expose should error out")

+	}

+}

+

+func (s *DockerSuite) TestRunLinkToContainerNetMode(c *check.C) {

+	dockerCmd(c, "run", "--name", "test", "-d", "busybox", "top")

+	dockerCmd(c, "run", "--name", "parent", "-d", "--net=container:test", "busybox", "top")

+	dockerCmd(c, "run", "-d", "--link=parent:parent", "busybox", "top")

+	dockerCmd(c, "run", "--name", "child", "-d", "--net=container:parent", "busybox", "top")

+	dockerCmd(c, "run", "-d", "--link=child:child", "busybox", "top")

+}

+

+func (s *DockerSuite) TestRunLoopbackOnlyExistsWhenNetworkingDisabled(c *check.C) {

+	out, _ := dockerCmd(c, "run", "--net=none", "busybox", "ip", "-o", "-4", "a", "show", "up")

+

+	var (

+		count = 0

+		parts = strings.Split(out, "\n")

+	)

+

+	for _, l := range parts {

+		if l != "" {

+			count++

+		}

+	}

+

+	if count != 1 {

+		c.Fatalf("Wrong interface count in container %d", count)

+	}

+

+	if !strings.HasPrefix(out, "1: lo") {

+		c.Fatalf("Wrong interface in test container: expected [1: lo], got %s", out)

+	}

+}

+

+// Issue #4681

+func (s *DockerSuite) TestRunLoopbackWhenNetworkDisabled(c *check.C) {

+	dockerCmd(c, "run", "--net=none", "busybox", "ping", "-c", "1", "127.0.0.1")

+}

+

+func (s *DockerSuite) TestRunModeNetContainerHostname(c *check.C) {

+	testRequires(c, ExecSupport)

+

+	dockerCmd(c, "run", "-i", "-d", "--name", "parent", "busybox", "top")

+	out, _ := dockerCmd(c, "exec", "parent", "cat", "/etc/hostname")

+	out1, _ := dockerCmd(c, "run", "--net=container:parent", "busybox", "cat", "/etc/hostname")

+

+	if out1 != out {

+		c.Fatal("containers with shared net namespace should have same hostname")

+	}

+}

+

+func (s *DockerSuite) TestRunNetworkNotInitializedNoneMode(c *check.C) {

+	out, _, err := dockerCmdWithError("run", "-d", "--net=none", "busybox", "top")

+	id := strings.TrimSpace(out)

+	res, err := inspectField(id, "NetworkSettings.IPAddress")

+	c.Assert(err, check.IsNil)

+	if res != "" {

+		c.Fatalf("For 'none' mode network must not be initialized, but container got IP: %s", res)

+	}

+}

+

+func (s *DockerSuite) TestTwoContainersInNetHost(c *check.C) {

+	dockerCmd(c, "run", "-d", "--net=host", "--name=first", "busybox", "top")

+	dockerCmd(c, "run", "-d", "--net=host", "--name=second", "busybox", "top")

+	dockerCmd(c, "stop", "first")

+	dockerCmd(c, "stop", "second")

+}

@@ -8,7 +8,6 @@ import (

 	"io/ioutil"

 	"os"

 	"os/exec"

-	"path"

 	"path/filepath"

 	"strings"

 	"time"

@@ -86,87 +85,6 @@ func (s *DockerSuite) TestRunWithVolumesIsRecursive(c *check.C) {

 	}

 }

-func (s *DockerSuite) TestRunWithUlimits(c *check.C) {

-	testRequires(c, NativeExecDriver)

-

-	out, _ := dockerCmd(c, "run", "--name=testulimits", "--ulimit", "nofile=42", "busybox", "/bin/sh", "-c", "ulimit -n")

-	ul := strings.TrimSpace(out)

-	if ul != "42" {

-		c.Fatalf("expected `ulimit -n` to be 42, got %s", ul)

-	}

-}

-

-func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) {

-	testRequires(c, NativeExecDriver)

-

-	cgroupParent := "test"

-	name := "cgroup-test"

-

-	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")

-	if err != nil {

-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)

-	}

-	cgroupPaths := parseCgroupPaths(string(out))

-	if len(cgroupPaths) == 0 {

-		c.Fatalf("unexpected output - %q", string(out))

-	}

-	id, err := getIDByName(name)

-	c.Assert(err, check.IsNil)

-	expectedCgroup := path.Join(cgroupParent, id)

-	found := false

-	for _, path := range cgroupPaths {

-		if strings.HasSuffix(path, expectedCgroup) {

-			found = true

-			break

-		}

-	}

-	if !found {

-		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)

-	}

-}

-

-func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) {

-	testRequires(c, NativeExecDriver)

-

-	cgroupParent := "/cgroup-parent/test"

-	name := "cgroup-test"

-	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")

-	if err != nil {

-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)

-	}

-	cgroupPaths := parseCgroupPaths(string(out))

-	if len(cgroupPaths) == 0 {

-		c.Fatalf("unexpected output - %q", string(out))

-	}

-	id, err := getIDByName(name)

-	c.Assert(err, check.IsNil)

-	expectedCgroup := path.Join(cgroupParent, id)

-	found := false

-	for _, path := range cgroupPaths {

-		if strings.HasSuffix(path, expectedCgroup) {

-			found = true

-			break

-		}

-	}

-	if !found {

-		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)

-	}

-}

-

-func (s *DockerSuite) TestRunContainerWithCgroupMountRO(c *check.C) {

-	testRequires(c, NativeExecDriver)

-

-	filename := "/sys/fs/cgroup/devices/test123"

-	out, _, err := dockerCmdWithError("run", "busybox", "touch", filename)

-	if err == nil {

-		c.Fatal("expected cgroup mount point to be read-only, touch file should fail")

-	}

-	expected := "Read-only file system"

-	if !strings.Contains(out, expected) {

-		c.Fatalf("expected output from failure to contain %s but contains %s", expected, out)

-	}

-}

-

 func (s *DockerSuite) TestRunDeviceDirectory(c *check.C) {

 	testRequires(c, NativeExecDriver)

@@ -366,119 +284,6 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {

 	}

 }

-func (s *DockerSuite) TestContainerNetworkModeToSelf(c *check.C) {

-	out, _, err := dockerCmdWithError("run", "--name=me", "--net=container:me", "busybox", "true")

-	if err == nil || !strings.Contains(out, "cannot join own network") {

-		c.Fatalf("using container net mode to self should result in an error")

-	}

-}

-

-func (s *DockerSuite) TestRunContainerNetModeWithDnsMacHosts(c *check.C) {

-	out, _, err := dockerCmdWithError("run", "-d", "--name", "parent", "busybox", "top")

-	if err != nil {

-		c.Fatalf("failed to run container: %v, output: %q", err, out)

-	}

-

-	out, _, err = dockerCmdWithError("run", "--dns", "1.2.3.4", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, "Conflicting options: --dns and the network mode") {

-		c.Fatalf("run --net=container with --dns should error out")

-	}

-

-	out, _, err = dockerCmdWithError("run", "--mac-address", "92:d0:c6:0a:29:33", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, "--mac-address and the network mode") {

-		c.Fatalf("run --net=container with --mac-address should error out")

-	}

-

-	out, _, err = dockerCmdWithError("run", "--add-host", "test:192.168.2.109", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, "--add-host and the network mode") {

-		c.Fatalf("run --net=container with --add-host should error out")

-	}

-}

-

-func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) {

-	dockerCmd(c, "run", "-d", "--name", "parent", "busybox", "top")

-

-	out, _, err := dockerCmdWithError("run", "-p", "5000:5000", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, "Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)") {

-		c.Fatalf("run --net=container with -p should error out")

-	}

-

-	out, _, err = dockerCmdWithError("run", "-P", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, "Conflicting options: -p, -P, --publish-all, --publish and the network mode (--net)") {

-		c.Fatalf("run --net=container with -P should error out")

-	}

-

-	out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox")

-	if err == nil || !strings.Contains(out, "Conflicting options: --expose and the network mode (--expose)") {

-		c.Fatalf("run --net=container with --expose should error out")

-	}

-}

-

-func (s *DockerSuite) TestRunLinkToContainerNetMode(c *check.C) {

-	dockerCmd(c, "run", "--name", "test", "-d", "busybox", "top")

-	dockerCmd(c, "run", "--name", "parent", "-d", "--net=container:test", "busybox", "top")

-	dockerCmd(c, "run", "-d", "--link=parent:parent", "busybox", "top")

-	dockerCmd(c, "run", "--name", "child", "-d", "--net=container:parent", "busybox", "top")

-	dockerCmd(c, "run", "-d", "--link=child:child", "busybox", "top")

-}

-

-func (s *DockerSuite) TestRunLoopbackOnlyExistsWhenNetworkingDisabled(c *check.C) {

-	out, _ := dockerCmd(c, "run", "--net=none", "busybox", "ip", "-o", "-4", "a", "show", "up")

-

-	var (

-		count = 0

-		parts = strings.Split(out, "\n")

-	)

-

-	for _, l := range parts {

-		if l != "" {

-			count++

-		}

-	}

-

-	if count != 1 {

-		c.Fatalf("Wrong interface count in container %d", count)

-	}

-

-	if !strings.HasPrefix(out, "1: lo") {

-		c.Fatalf("Wrong interface in test container: expected [1: lo], got %s", out)

-	}

-}

-

-// Issue #4681

-func (s *DockerSuite) TestRunLoopbackWhenNetworkDisabled(c *check.C) {

-	dockerCmd(c, "run", "--net=none", "busybox", "ping", "-c", "1", "127.0.0.1")

-}

-

-func (s *DockerSuite) TestRunModeNetContainerHostname(c *check.C) {

-	testRequires(c, ExecSupport)

-

-	dockerCmd(c, "run", "-i", "-d", "--name", "parent", "busybox", "top")

-	out, _ := dockerCmd(c, "exec", "parent", "cat", "/etc/hostname")

-	out1, _ := dockerCmd(c, "run", "--net=container:parent", "busybox", "cat", "/etc/hostname")

-

-	if out1 != out {

-		c.Fatal("containers with shared net namespace should have same hostname")

-	}

-}

-

-func (s *DockerSuite) TestRunNetworkNotInitializedNoneMode(c *check.C) {

-	out, _, err := dockerCmdWithError("run", "-d", "--net=none", "busybox", "top")

-	id := strings.TrimSpace(out)

-	res, err := inspectField(id, "NetworkSettings.IPAddress")

-	c.Assert(err, check.IsNil)

-	if res != "" {

-		c.Fatalf("For 'none' mode network must not be initialized, but container got IP: %s", res)

-	}

-}

-

-func (s *DockerSuite) TestTwoContainersInNetHost(c *check.C) {

-	dockerCmd(c, "run", "-d", "--net=host", "--name=first", "busybox", "top")

-	dockerCmd(c, "run", "-d", "--net=host", "--name=second", "busybox", "top")

-	dockerCmd(c, "stop", "first")

-	dockerCmd(c, "stop", "second")

-}

-

 // "test" should be printed

 func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {

 	testRequires(c, memoryLimitSupport)