github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

component status: nil error should return empty string

Browse Source 
If error is nil, it should return empty string instead of \"nil\".
JSON marshalling will omit empty error in such case.
This commit is contained in:
Hongchao Deng 2015-11-05 13:26:03 -08:00
parent bdac198130
commit 056536ff83
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/get_test.go
View File

@ -88,7 +88,7 @@ func testData() (*api.PodList, *api.ServiceList, *api.ReplicationControllerList)
func testComponentStatusData() *api.ComponentStatusList {
good := api.ComponentStatus{
Conditions: []api.ComponentCondition{
{Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok", Error: "nil"},
{Type: api.ComponentHealthy, Status: api.ConditionTrue, Message: "ok"},
},
ObjectMeta: api.ObjectMeta{Name: "servergood"},
}

4
pkg/registry/componentstatus/rest.go
View File

@ -85,11 +85,9 @@ func ToConditionStatus(s probe.Result) api.ConditionStatus {
func (rs *REST) getComponentStatus(name string, server apiserver.Server) *api.ComponentStatus {
transport := rs.rt
status, msg, err := server.DoServerCheck(transport)
var errorMsg string
errorMsg := ""
if err != nil {
errorMsg = err.Error()
} else {
errorMsg = "nil"
}
c := &api.ComponentCondition{

4
pkg/registry/componentstatus/rest_test.go
View File

@ -81,7 +81,7 @@ func TestList_NoError(t *testing.T) {
t.Fatalf("Unexpected error: %v", err)
}
expect := &api.ComponentStatusList{
Items: []api.ComponentStatus{*(createTestStatus("test1", api.ConditionTrue, "ok", "nil"))},
Items: []api.ComponentStatus{*(createTestStatus("test1", api.ConditionTrue, "ok", ""))},
}
if e, a := expect, got; !reflect.DeepEqual(e, a) {
t.Errorf("Got unexpected object. Diff: %s", util.ObjectDiff(e, a))
@ -124,7 +124,7 @@ func TestGet_NoError(t *testing.T) {
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
expect := createTestStatus("test1", api.ConditionTrue, "ok", "nil")
expect := createTestStatus("test1", api.ConditionTrue, "ok", "")
if e, a := expect, got; !reflect.DeepEqual(e, a) {
t.Errorf("Got unexpected object. Diff: %s", util.ObjectDiff(e, a))
}