From ae603b8ef143a5f3d567711a869f5f9df908a948 Mon Sep 17 00:00:00 2001 From: Rodrigo Villablanca Date: Sun, 12 Apr 2020 18:37:22 -0400 Subject: [PATCH] Add some testing --- pkg/kubelet/server/server_test.go | 14 ++++++++++++++ pkg/kubelet/server/stats/handler.go | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 96dce2c86a9..d65828eac12 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -1579,6 +1579,20 @@ func TestDebuggingDisabledHandlers(t *testing.T) { } +func TestFailedParseParamsSummaryHandler(t *testing.T) { + fw := newServerTest() + defer fw.testHTTPServer.Close() + + resp, err := http.Post(fw.testHTTPServer.URL+"/stats/summary", "invalid/content/type", nil) + assert.NoError(t, err) + defer resp.Body.Close() + v, err := ioutil.ReadAll(resp.Body) + assert.NoError(t, err) + assert.Equal(t, http.StatusInternalServerError, resp.StatusCode) + assert.Contains(t, string(v), "parse form failed") + +} + func TestTrimURLPath(t *testing.T) { tests := []struct { path, expected string diff --git a/pkg/kubelet/server/stats/handler.go b/pkg/kubelet/server/stats/handler.go index ae98e3a9f39..3dc23b45fe1 100644 --- a/pkg/kubelet/server/stats/handler.go +++ b/pkg/kubelet/server/stats/handler.go @@ -26,6 +26,7 @@ import ( restful "github.com/emicklei/go-restful" cadvisorapi "github.com/google/cadvisor/info/v1" + "github.com/pkg/errors" "k8s.io/klog" "k8s.io/api/core/v1" @@ -217,7 +218,7 @@ func (h *handler) handleSummary(request *restful.Request, response *restful.Resp onlyCPUAndMemory := false err := request.Request.ParseForm() if err != nil { - handleError(response, "/stats/summary", err) + handleError(response, "/stats/summary", errors.Wrapf(err, "parse form failed")) return } if onlyCluAndMemoryParam, found := request.Request.Form["only_cpu_and_memory"]; found &&