github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21341 from smarterclayton/liveness_describer

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-20 23:31:22 -08:00
parent 0f1043d6df c198367958
commit 12383dfa0c
2 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/describe_test.go
View File

@@ -268,7 +268,7 @@ func TestDescribeContainers(t *testing.T) {
ContainerStatuses: []api.ContainerStatus{testCase.status},
},
}
describeContainers(&pod, out)
DescribeContainers(pod.Spec.Containers, pod.Status.ContainerStatuses, EnvValueRetriever(&pod), out)
output := out.String()
for _, expected := range testCase.expectedElements {
if !strings.Contains(output, expected) {