|
@@ -237,7 +237,7 @@ func (s *DockerSuite) TestRunEchoStdoutWitCPUShares(c *check.C) {
|
|
|
func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
|
|
|
testRequires(c, cpuShare)
|
|
|
testRequires(c, memoryLimitSupport)
|
|
|
- out, _, _ := dockerCmdWithStdoutStderr(c, "run", "--cpu-shares", "1000", "-m", "16m", "busybox", "echo", "test")
|
|
|
+ out, _, _ := dockerCmdWithStdoutStderr(c, "run", "--cpu-shares", "1000", "-m", "32m", "busybox", "echo", "test")
|
|
|
if out != "test\n" {
|
|
|
c.Errorf("container should've printed 'test', got %q instead", out)
|
|
|
}
|
|
@@ -302,7 +302,7 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
|
|
|
// "test" should be printed
|
|
|
func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
|
|
|
testRequires(c, memoryLimitSupport)
|
|
|
- out, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "16m", "busybox", "echo", "test")
|
|
|
+ out, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "32m", "busybox", "echo", "test")
|
|
|
out = strings.Trim(out, "\r\n")
|
|
|
|
|
|
if expected := "test"; out != expected {
|
|
@@ -443,7 +443,7 @@ func (s *DockerSuite) TestRunWithCorrectMemorySwapOnLXC(c *check.C) {
|
|
|
testRequires(c, swapMemorySupport)
|
|
|
testRequires(c, SameHostDaemon)
|
|
|
|
|
|
- out, _ := dockerCmd(c, "run", "-d", "-m", "16m", "--memory-swap", "64m", "busybox", "top")
|
|
|
+ out, _ := dockerCmd(c, "run", "-d", "-m", "32m", "--memory-swap", "64m", "busybox", "top")
|
|
|
if _, err := os.Stat("/sys/fs/cgroup/memory/lxc"); err != nil {
|
|
|
c.Skip("Excecution driver must be LXC for this test")
|
|
|
}
|