Browse Source

Merge pull request #12207 from WiseTrem/getBoolParam

Removing unused getBoolParam func from api/server/server.go
Doug Davis 10 years ago
parent
commit
8295bed3df
2 changed files with 0 additions and 36 deletions
  1. 0 11
      api/server/server.go
  2. 0 25
      api/server/server_unit_test.go

+ 0 - 11
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)
 }

+ 0 - 25
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()