From f509a54bdd29b8f65c17097fde3664c6fad36c21 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Sun, 7 Jan 2018 05:10:36 +0000
Subject: [PATCH] Add test case for `docker ps -f health=starting`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 container/state.go     |  9 ---------
 container/view_test.go | 24 ++++++++++++++++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/container/state.go b/container/state.go
index 3af4015ed9..81c3b45948 100644
--- a/container/state.go
+++ b/container/state.go
@@ -102,15 +102,6 @@ func (s *State) String() string {
 	return fmt.Sprintf("Exited (%d) %s ago", s.ExitCodeValue, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
 }
 
-// HealthString returns a single string to describe health status.
-func (s *State) HealthString() string {
-	if s.Health == nil {
-		return types.NoHealthcheck
-	}
-
-	return s.Health.String()
-}
-
 // IsValidHealthString checks if the provided string is a valid container health status or not.
 func IsValidHealthString(s string) bool {
 	return s == types.Starting ||
diff --git a/container/view_test.go b/container/view_test.go
index 4535a8fade..c425aaf731 100644
--- a/container/view_test.go
+++ b/container/view_test.go
@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/docker/docker/api/types"
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/pborman/uuid"
 	"github.com/stretchr/testify/assert"
@@ -159,3 +160,26 @@ func TestNames(t *testing.T) {
 	view = db.Snapshot()
 	assert.Equal(t, map[string][]string{"containerid4": {"name1", "name2"}}, view.GetAllNames())
 }
+
+// Test case for GitHub issue 35920
+func TestViewWithHealthCheck(t *testing.T) {
+	var (
+		db, _ = NewViewDB()
+		one   = newContainer(t)
+	)
+	one.Health = &Health{
+		Health: types.Health{
+			Status: "starting",
+		},
+	}
+	if err := one.CheckpointTo(db); err != nil {
+		t.Fatal(err)
+	}
+	s, err := db.Snapshot().Get(one.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s == nil || s.Health != "starting" {
+		t.Fatalf("expected Health=starting. Got: %+v", s)
+	}
+}