beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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>
This commit is contained in:
Thomas Leonard 2016-06-16 13:07:06 +01:00
parent 6253c29494
commit 18a59bb869
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
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.ExitCode, checker.Equals, 0)
c.Check(last.Output, checker.Equals, "OK\n") 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") 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") failsStr, _ := dockerCmd(c, "inspect", "--format={{.State.Health.FailingStreak}}", "fatal_healthcheck")
fails, err := strconv.Atoi(strings.TrimSpace(failsStr)) fails, err := strconv.Atoi(strings.TrimSpace(failsStr))
c.Check(err, check.IsNil) c.Check(err, check.IsNil)