github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-05 19:21:37 +00:00
Code Issues Projects Releases Wiki Activity

Changed PodInfo to be a list

Browse Source 
This change is to make API consistent with our convention.

Fixes #3622
This commit is contained in:
Piotr Szczesniak
2015-03-25 12:09:35 +01:00
parent 8183a4805e
commit 31901ed9d0
14 changed files with 392 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/kubectl/resource_printer_test.go
View File

@@ -327,11 +327,15 @@ func TestTemplateStrings(t *testing.T) {
expect string
}{
"nilInfo": {api.Pod{}, "false"},
"emptyInfo": {api.Pod{Status: api.PodStatus{Info: api.PodInfo{}}}, "false"},
"emptyInfo": {api.Pod{Status: api.PodStatus{ContainerStatuses: []api.ContainerStatus{}}}, "false"},
"fooExists": {
api.Pod{
Status: api.PodStatus{
Info: api.PodInfo{"foo": api.ContainerStatus{}},
ContainerStatuses: []api.ContainerStatus{
{
Name: "foo",
},
},
},
},
"false",
@@ -339,7 +343,11 @@ func TestTemplateStrings(t *testing.T) {
"barExists": {
api.Pod{
Status: api.PodStatus{
Info: api.PodInfo{"bar": api.ContainerStatus{}},
ContainerStatuses: []api.ContainerStatus{
{
Name: "bar",
},
},
},
},
"false",
@@ -347,9 +355,13 @@ func TestTemplateStrings(t *testing.T) {
"bothExist": {
api.Pod{
Status: api.PodStatus{
Info: api.PodInfo{
"foo": api.ContainerStatus{},
"bar": api.ContainerStatus{},
ContainerStatuses: []api.ContainerStatus{
{
Name: "foo",
},
{
Name: "bar",
},
},
},
},
@@ -358,9 +370,12 @@ func TestTemplateStrings(t *testing.T) {
"oneValid": {
api.Pod{
Status: api.PodStatus{
Info: api.PodInfo{
"foo": api.ContainerStatus{},
"bar": api.ContainerStatus{
ContainerStatuses: []api.ContainerStatus{
{
Name: "foo",
},
{
Name: "bar",
State: api.ContainerState{
Running: &api.ContainerStateRunning{
StartedAt: util.Time{},
@@ -375,15 +390,17 @@ func TestTemplateStrings(t *testing.T) {
"bothValid": {
api.Pod{
Status: api.PodStatus{
Info: api.PodInfo{
"foo": api.ContainerStatus{
ContainerStatuses: []api.ContainerStatus{
{
Name: "foo",
State: api.ContainerState{
Running: &api.ContainerStateRunning{
StartedAt: util.Time{},
},
},
},
"bar": api.ContainerStatus{
{
Name: "bar",
State: api.ContainerState{
Running: &api.ContainerStateRunning{
StartedAt: util.Time{},