From 2a209afe5fe0f27296e3e06a199bb5305910e1cf Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Thu, 14 Nov 2013 06:11:28 +0000 Subject: [PATCH] gofmt --- container_unit_test.go | 7 ------- http_test.go | 3 +-- runtime.go | 1 - server_unit_test.go | 1 - tags_unit_test.go | 5 ++--- utils/utils.go | 3 --- 6 files changed, 3 insertions(+), 17 deletions(-) diff --git a/container_unit_test.go b/container_unit_test.go index 9647327d98..679f25eee7 100644 --- a/container_unit_test.go +++ b/container_unit_test.go @@ -4,8 +4,6 @@ import ( "testing" ) - - func TestParseLxcConfOpt(t *testing.T) { opts := []string{"lxc.utsname=docker", "lxc.utsname = docker "} @@ -149,12 +147,8 @@ func TestParseNetworkOptsUdp(t *testing.T) { } } - - - // FIXME: test that destroying a container actually removes its root directory - /* func TestLXCConfig(t *testing.T) { // Memory is allocated randomly for testing @@ -242,7 +236,6 @@ func grepFile(t *testing.T, path string, pattern string) { } */ - func TestGetFullName(t *testing.T) { name, err := getFullName("testing") if err != nil { diff --git a/http_test.go b/http_test.go index 64764424cb..b9ecd6a203 100644 --- a/http_test.go +++ b/http_test.go @@ -1,13 +1,12 @@ package docker import ( - "testing" "fmt" "net/http" "net/http/httptest" + "testing" ) - func TestGetBoolParam(t *testing.T) { if ret, err := getBoolParam("true"); err != nil || !ret { t.Fatalf("true -> true, nil | got %t %s", ret, err) diff --git a/runtime.go b/runtime.go index bb90301d48..4559164e28 100644 --- a/runtime.go +++ b/runtime.go @@ -680,7 +680,6 @@ func (runtime *Runtime) Nuke() error { return os.RemoveAll(runtime.config.Root) } - func linkLxcStart(root string) error { sourcePath, err := exec.LookPath("lxc-start") if err != nil { diff --git a/server_unit_test.go b/server_unit_test.go index 7ce03e3547..a51e2ddff5 100644 --- a/server_unit_test.go +++ b/server_unit_test.go @@ -55,7 +55,6 @@ func TestPools(t *testing.T) { } } - func TestLogEvent(t *testing.T) { srv := &Server{ events: make([]utils.JSONMessage, 0, 64), diff --git a/tags_unit_test.go b/tags_unit_test.go index 89f31676f7..0f72e30200 100644 --- a/tags_unit_test.go +++ b/tags_unit_test.go @@ -2,9 +2,9 @@ package docker import ( "github.com/dotcloud/docker/utils" - "testing" - "path" "os" + "path" + "testing" ) const ( @@ -35,7 +35,6 @@ func mkTestTagStore(root string, t *testing.T) *TagStore { return store } - func TestLookupImage(t *testing.T) { tmp, err := utils.TestDirectory("") if err != nil { diff --git a/utils/utils.go b/utils/utils.go index 0844abdde6..1361cfaf8d 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1208,8 +1208,6 @@ func PartParser(template, data string) (map[string]string, error) { return out, nil } - - var globalTestID string // TestDirectory creates a new temporary directory and returns its path. @@ -1246,4 +1244,3 @@ func GetCallerName(depth int) string { callerShortName := parts[len(parts)-1] return callerShortName } -