From 641a7ec9ad61a42b255d203b7791198431761104 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Mon, 20 Apr 2015 16:27:47 +0800 Subject: [PATCH] remove unused function in server_unit_test.go After engine refactor, some functions are no longer used. Signed-off-by: Qiang Huang --- api/server/server_unit_test.go | 47 ---------------------------------- 1 file changed, 47 deletions(-) diff --git a/api/server/server_unit_test.go b/api/server/server_unit_test.go index aca3af9fff..7ac0c22688 100644 --- a/api/server/server_unit_test.go +++ b/api/server/server_unit_test.go @@ -1,7 +1,6 @@ package server import ( - "bytes" "encoding/json" "fmt" "io" @@ -10,7 +9,6 @@ import ( "testing" "github.com/docker/docker/api" - "github.com/docker/docker/api/types" "github.com/docker/docker/engine" "github.com/docker/docker/pkg/version" ) @@ -160,53 +158,8 @@ func readEnv(src io.Reader, t *testing.T) *engine.Env { return v } -func toJson(data interface{}, t *testing.T) io.Reader { - var buf bytes.Buffer - if err := json.NewEncoder(&buf).Encode(data); err != nil { - t.Fatal(err) - } - return &buf -} - func assertContentType(recorder *httptest.ResponseRecorder, contentType string, t *testing.T) { if recorder.HeaderMap.Get("Content-Type") != contentType { t.Fatalf("%#v\n", recorder) } } - -// XXX: Duplicated from integration/utils_test.go, but maybe that's OK as that -// should die as soon as we converted all integration tests? -// assertHttpNotError expect the given response to not have an error. -// Otherwise the it causes the test to fail. -func assertHttpNotError(r *httptest.ResponseRecorder, t *testing.T) { - // Non-error http status are [200, 400) - if r.Code < http.StatusOK || r.Code >= http.StatusBadRequest { - t.Fatal(fmt.Errorf("Unexpected http error: %v", r.Code)) - } -} - -func createEnvFromGetImagesJSONStruct(data getImagesJSONStruct) types.Image { - return types.Image{ - RepoTags: data.RepoTags, - ID: data.Id, - Created: int(data.Created), - Size: int(data.Size), - VirtualSize: int(data.VirtualSize), - } -} - -type getImagesJSONStruct struct { - RepoTags []string - Id string - Created int64 - Size int64 - VirtualSize int64 -} - -var sampleImage getImagesJSONStruct = getImagesJSONStruct{ - RepoTags: []string{"test-name:test-tag"}, - Id: "ID", - Created: 999, - Size: 777, - VirtualSize: 666, -}