toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove out-of-date health test

Browse Source 
The test was waiting for the container to exit after failing its
healthcheck. However, we no longer automatically terminate containers,
so this waited instead for the container to time-out by itself.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
Upstream-commit: 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8
Component: engine
This commit is contained in:
Thomas Leonard
2016-06-16 13:07:06 +01:00
parent 5445763ee1
commit c4c90efda6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/integration-cli/docker_cli_health_test.go
View File

@ -127,12 +127,10 @@ func (s *DockerSuite) TestHealth(c *check.C) {
c.Check(last.ExitCode, checker.Equals, 0)
c.Check(last.Output, checker.Equals, "OK\n")
// Fail the check, which should now make it exit
// Fail the check
dockerCmd(c, "exec", "fatal_healthcheck", "rm", "/status")
waitForStatus(c, "fatal_healthcheck", "running", "exited")
waitForHealthStatus(c, "fatal_healthcheck", "healthy", "unhealthy")
out, _ = dockerCmd(c, "inspect", "--format={{.State.Health.Status}}", "fatal_healthcheck")
c.Check(out, checker.Equals, "unhealthy\n")
failsStr, _ := dockerCmd(c, "inspect", "--format={{.State.Health.FailingStreak}}", "fatal_healthcheck")
fails, err := strconv.Atoi(strings.TrimSpace(failsStr))
c.Check(err, check.IsNil)