浏览代码

GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>

Srini Brahmaroutu 9 年之前
父节点
当前提交
2046ba3e3c
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      integration-cli/docker_cli_logs_test.go
  2. 3 3
      integration-cli/docker_cli_run_unix_test.go

+ 1 - 1
integration-cli/docker_cli_logs_test.go

@@ -216,7 +216,7 @@ func (s *DockerSuite) TestLogsSinceFutureFollow(c *check.C) {
 // Regression test for #8832
 // Regression test for #8832
 func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) {
 func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) {
 	testRequires(c, DaemonIsLinux)
 	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 200000;yes X | head -c 200000`)
+	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 600000;yes X | head -c 200000`)
 
 
 	id := strings.TrimSpace(out)
 	id := strings.TrimSpace(out)
 
 

+ 3 - 3
integration-cli/docker_cli_run_unix_test.go

@@ -237,7 +237,7 @@ func (s *DockerSuite) TestRunEchoStdoutWitCPUShares(c *check.C) {
 func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
 func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
 	testRequires(c, cpuShare)
 	testRequires(c, cpuShare)
 	testRequires(c, memoryLimitSupport)
 	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" {
 	if out != "test\n" {
 		c.Errorf("container should've printed 'test', got %q instead", out)
 		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
 // "test" should be printed
 func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
 func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
 	testRequires(c, memoryLimitSupport)
 	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")
 	out = strings.Trim(out, "\r\n")
 
 
 	if expected := "test"; out != expected {
 	if expected := "test"; out != expected {
@@ -443,7 +443,7 @@ func (s *DockerSuite) TestRunWithCorrectMemorySwapOnLXC(c *check.C) {
 	testRequires(c, swapMemorySupport)
 	testRequires(c, swapMemorySupport)
 	testRequires(c, SameHostDaemon)
 	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 {
 	if _, err := os.Stat("/sys/fs/cgroup/memory/lxc"); err != nil {
 		c.Skip("Excecution driver must be LXC for this test")
 		c.Skip("Excecution driver must be LXC for this test")
 	}
 	}