InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 10:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

api/types/container: make HealthStatus a concrete type

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-11-07 18:36:12 +01:00
parent 1fd87e9fdf
commit db71c6a914
8 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
integration-cli/docker_cli_health_test.go
View File

@@ -26,16 +26,17 @@ func (s *DockerCLIHealthSuite) OnTimeout(t *testing.T) {
s.ds.OnTimeout(t)
}
func waitForHealthStatus(t *testing.T, name string, prev string, expected string) {
prev = prev + "\n"
expected = expected + "\n"
func waitForHealthStatus(t *testing.T, name string, prev container.HealthStatus, expected container.HealthStatus) {
for {
out := cli.DockerCmd(t, "inspect", "--format={{.State.Health.Status}}", name).Stdout()
if out == expected {
actual := container.HealthStatus(strings.TrimSpace(out))
if actual == expected {
return
}
assert.Equal(t, out, prev)
if out != prev {
// TODO(thaJeztah): this logic seems broken? assert.Assert would make it fail, so why the "actual != prev"?
assert.Equal(t, actual, prev)
if actual != prev {
return
}
time.Sleep(100 * time.Millisecond)
@@ -84,7 +85,7 @@ func (s *DockerCLIHealthSuite) TestHealth(c *testing.T) {
// Inspect the status
out = cli.DockerCmd(c, "inspect", "--format={{.State.Health.Status}}", name).Stdout()
assert.Equal(c, strings.TrimSpace(out), container.Unhealthy)
assert.Equal(c, container.HealthStatus(strings.TrimSpace(out)), container.Unhealthy)
// Make it healthy again
cli.DockerCmd(c, "exec", name, "touch", "/status")