Browse code

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

Srini Brahmaroutu authored on 2015/10/27 00:46:49
Showing 2 changed files
... ...
@@ -216,7 +216,7 @@ func (s *DockerSuite) TestLogsSinceFutureFollow(c *check.C) {
216 216
 // Regression test for #8832
217 217
 func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) {
218 218
 	testRequires(c, DaemonIsLinux)
219
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 200000;yes X | head -c 200000`)
219
+	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 600000;yes X | head -c 200000`)
220 220
 
221 221
 	id := strings.TrimSpace(out)
222 222
 
... ...
@@ -237,7 +237,7 @@ func (s *DockerSuite) TestRunEchoStdoutWitCPUShares(c *check.C) {
237 237
 func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
238 238
 	testRequires(c, cpuShare)
239 239
 	testRequires(c, memoryLimitSupport)
240
-	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "--cpu-shares", "1000", "-m", "16m", "busybox", "echo", "test")
240
+	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "--cpu-shares", "1000", "-m", "32m", "busybox", "echo", "test")
241 241
 	if out != "test\n" {
242 242
 		c.Errorf("container should've printed 'test', got %q instead", out)
243 243
 	}
... ...
@@ -302,7 +302,7 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
302 302
 // "test" should be printed
303 303
 func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
304 304
 	testRequires(c, memoryLimitSupport)
305
-	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "16m", "busybox", "echo", "test")
305
+	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "32m", "busybox", "echo", "test")
306 306
 	out = strings.Trim(out, "\r\n")
307 307
 
308 308
 	if expected := "test"; out != expected {
... ...
@@ -443,7 +443,7 @@ func (s *DockerSuite) TestRunWithCorrectMemorySwapOnLXC(c *check.C) {
443 443
 	testRequires(c, swapMemorySupport)
444 444
 	testRequires(c, SameHostDaemon)
445 445
 
446
-	out, _ := dockerCmd(c, "run", "-d", "-m", "16m", "--memory-swap", "64m", "busybox", "top")
446
+	out, _ := dockerCmd(c, "run", "-d", "-m", "32m", "--memory-swap", "64m", "busybox", "top")
447 447
 	if _, err := os.Stat("/sys/fs/cgroup/memory/lxc"); err != nil {
448 448
 		c.Skip("Excecution driver must be LXC for this test")
449 449
 	}