From 2a0291489247b79058f0f94a2af7c5b3f89b78af Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Fri, 11 Mar 2016 15:09:00 -0500 Subject: [PATCH] Fix error-checking when looking at empty log Fixes a bug when the log output is empty. The length of a slice containing an empty string is 1, not 0, so the test fails to catch when the log is empty. Instead, take a look at out, which is just a string. Signed-off-by: Christopher Jones --- integration-cli/docker_cli_logs_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go index 95964c14e7..870f453321 100644 --- a/integration-cli/docker_cli_logs_test.go +++ b/integration-cli/docker_cli_logs_test.go @@ -218,8 +218,8 @@ func (s *DockerSuite) TestLogsSinceFutureFollow(c *check.C) { since := t.Unix() + 2 out, _ = dockerCmd(c, "logs", "-t", "-f", fmt.Sprintf("--since=%v", since), name) + c.Assert(out, checker.Not(checker.HasLen), 0, check.Commentf("cannot read from empty log")) lines := strings.Split(strings.TrimSpace(out), "\n") - c.Assert(lines, checker.Not(checker.HasLen), 0) for _, v := range lines { ts, err := time.Parse(time.RFC3339Nano, strings.Split(v, " ")[0]) c.Assert(err, checker.IsNil, check.Commentf("cannot parse timestamp output from log: '%v'", v))