GitList

Browse code

TestLogsFollowSlowStdoutConsumer: fix for slow ARM

We run our CI on Scaleway C1 machine, which is pretty slow,
including I/O. This test was failing on it, as it tried to
write 100000 lines of log very fast, and the loggerCloseTimeout
(defined and used in container/monitor.go) prevents the
daemon to finish writing it within this time frame,

Reducing the size to 150000 characters (75000 lines) should
help avoiding hitting it, without compromising the test case
itself.

Alternatively, we could have increased the timeout further. It was
originally set to 1s (commit b6a42673a) and later increased 10x
(commit c0391bf55). Please let me know if you want me to go that way.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>

Kir Kolyshkin authored on 2017/09/19 00:47:55
Showing 1 changed files

integration-cli/docker_cli_logs_test.go

History View file @ 1bc93bf

@@ -214,14 +214,15 @@ func (s *DockerSuite) TestLogsSinceFutureFollow(c *check.C) {
                      func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) {
                      	// TODO Windows: Fix this test for TP5.
                      	testRequires(c, DaemonIsLinux)
                     -	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 600000;yes X | head -c 200000`)
                     +	expected := 150000
                     +	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", fmt.Sprintf("usleep 600000; yes X | head -c %d", expected))
                      	id := strings.TrimSpace(out)
                      	stopSlowRead := make(chan bool)
                      	go func() {
                     -		exec.Command(dockerBinary, "wait", id).Run()
                     +		dockerCmd(c, "wait", id)
                      		stopSlowRead <- true
                      	}()
@@ -239,7 +240,6 @@ func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) {
                      	c.Assert(err, checker.IsNil)
                      	actual := bytes1 + bytes2
                     -	expected := 200000
                      	c.Assert(actual, checker.Equals, expected)
+                     }