From 85a5c923c796e7c1711b6b9b09fb33b2706e9310 Mon Sep 17 00:00:00 2001 From: WiseTrem Date: Thu, 9 Apr 2015 02:27:49 +0300 Subject: [PATCH] Removing unused getBoolParam func from api/server/server.go Fix #12199 Signed-off-by: Gleb Shepelev Upstream-commit: 0fc75a3136456621c074124819567816420f55bf Component: engine --- components/engine/api/server/server.go | 11 -------- .../engine/api/server/server_unit_test.go | 25 ------------------- 2 files changed, 36 deletions(-) diff --git a/components/engine/api/server/server.go b/components/engine/api/server/server.go index e59aec5a79..70cb5d834a 100644 --- a/components/engine/api/server/server.go +++ b/components/engine/api/server/server.go @@ -161,17 +161,6 @@ func streamJSON(job *engine.Job, w http.ResponseWriter, flush bool) { } } -func getBoolParam(value string) (bool, error) { - if value == "" { - return false, nil - } - ret, err := strconv.ParseBool(value) - if err != nil { - return false, fmt.Errorf("Bad parameter") - } - return ret, nil -} - func getDaemon(eng *engine.Engine) *daemon.Daemon { return eng.HackGetGlobalVar("httpapi.daemon").(*daemon.Daemon) } diff --git a/components/engine/api/server/server_unit_test.go b/components/engine/api/server/server_unit_test.go index 6441b42cdf..607f254c7f 100644 --- a/components/engine/api/server/server_unit_test.go +++ b/components/engine/api/server/server_unit_test.go @@ -17,31 +17,6 @@ import ( "github.com/docker/docker/pkg/version" ) -func TestGetBoolParam(t *testing.T) { - if ret, err := getBoolParam("true"); err != nil || !ret { - t.Fatalf("true -> true, nil | got %t %s", ret, err) - } - if ret, err := getBoolParam("True"); err != nil || !ret { - t.Fatalf("True -> true, nil | got %t %s", ret, err) - } - if ret, err := getBoolParam("1"); err != nil || !ret { - t.Fatalf("1 -> true, nil | got %t %s", ret, err) - } - if ret, err := getBoolParam(""); err != nil || ret { - t.Fatalf("\"\" -> false, nil | got %t %s", ret, err) - } - if ret, err := getBoolParam("false"); err != nil || ret { - t.Fatalf("false -> false, nil | got %t %s", ret, err) - } - if ret, err := getBoolParam("0"); err != nil || ret { - t.Fatalf("0 -> false, nil | got %t %s", ret, err) - } - if ret, err := getBoolParam("faux"); err == nil || ret { - t.Fatalf("faux -> false, err | got %t %s", ret, err) - - } -} - func TesthttpError(t *testing.T) { r := httptest.NewRecorder()