From c4c90efda6714d679fde4d67055a17f22c457493 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Thu, 16 Jun 2016 13:07:06 +0100 Subject: [PATCH] Remove out-of-date health test 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 Upstream-commit: 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8 Component: engine --- components/engine/integration-cli/docker_cli_health_test.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_health_test.go b/components/engine/integration-cli/docker_cli_health_test.go index b374dba357..d231965332 100644 --- a/components/engine/integration-cli/docker_cli_health_test.go +++ b/components/engine/integration-cli/docker_cli_health_test.go @@ -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)