Merge pull request #35087 from corbin-coleman/fix-integration-stats-test

Fix One of the Docker Stats Tests in /integration-cli
Upstream-commit: ed082152f6e7c6c7c7fbf2bc777ba1ae88cb9073
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-10-05 17:59:53 +02:00
committed by GitHub
@@ -34,7 +34,7 @@ func (s *DockerSuite) TestStatsNoStream(c *check.C) {
select {
case outerr := <-ch:
c.Assert(outerr.err, checker.IsNil, check.Commentf("Error running stats: %v", outerr.err))
c.Assert(string(outerr.out), checker.Contains, id) //running container wasn't present in output
c.Assert(string(outerr.out), checker.Contains, id[:12]) //running container wasn't present in output
case <-time.After(3 * time.Second):
statsCmd.Process.Kill()
c.Fatalf("stats did not return immediately when not streaming")