docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21134 from tophj-ibm/fix-logtest-on-empty-log 

Fix error-checking when looking at empty log
This commit is contained in:
Brian Goff 2016-03-14 10:00:57 -04:00
parent 30999ba50c 2a02914892
commit 93e04e705a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration-cli/docker_cli_logs_test.go
View File

@ -218,8 +218,8 @@ func (s *DockerSuite) TestLogsSinceFutureFollow(c *check.C) {
since := t.Unix() + 2 since := t.Unix() + 2
out, _ = dockerCmd(c, "logs", "-t", "-f", fmt.Sprintf("--since=%v", since), name) 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") lines := strings.Split(strings.TrimSpace(out), "\n")
c.Assert(lines, checker.Not(checker.HasLen), 0)
for _, v := range lines { for _, v := range lines {
ts, err := time.Parse(time.RFC3339Nano, strings.Split(v, " ")[0]) 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)) c.Assert(err, checker.IsNil, check.Commentf("cannot parse timestamp output from log: '%v'", v))