Solomon Hykes há 11 anos atrás
pai
commit
2a209afe5f
6 ficheiros alterados com 3 adições e 17 exclusões
  1. 0 7
      container_unit_test.go
  2. 1 2
      http_test.go
  3. 0 1
      runtime.go
  4. 0 1
      server_unit_test.go
  5. 2 3
      tags_unit_test.go
  6. 0 3
      utils/utils.go

+ 0 - 7
container_unit_test.go

@@ -4,8 +4,6 @@ import (
 	"testing"
 	"testing"
 )
 )
 
 
-
-
 func TestParseLxcConfOpt(t *testing.T) {
 func TestParseLxcConfOpt(t *testing.T) {
 	opts := []string{"lxc.utsname=docker", "lxc.utsname = docker "}
 	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
 // FIXME: test that destroying a container actually removes its root directory
 
 
-
 /*
 /*
 func TestLXCConfig(t *testing.T) {
 func TestLXCConfig(t *testing.T) {
 	// Memory is allocated randomly for testing
 	// Memory is allocated randomly for testing
@@ -242,7 +236,6 @@ func grepFile(t *testing.T, path string, pattern string) {
 }
 }
 */
 */
 
 
-
 func TestGetFullName(t *testing.T) {
 func TestGetFullName(t *testing.T) {
 	name, err := getFullName("testing")
 	name, err := getFullName("testing")
 	if err != nil {
 	if err != nil {

+ 1 - 2
http_test.go

@@ -1,13 +1,12 @@
 package docker
 package docker
 
 
 import (
 import (
-	"testing"
 	"fmt"
 	"fmt"
 	"net/http"
 	"net/http"
 	"net/http/httptest"
 	"net/http/httptest"
+	"testing"
 )
 )
 
 
-
 func TestGetBoolParam(t *testing.T) {
 func TestGetBoolParam(t *testing.T) {
 	if ret, err := getBoolParam("true"); err != nil || !ret {
 	if ret, err := getBoolParam("true"); err != nil || !ret {
 		t.Fatalf("true -> true, nil | got %t %s", ret, err)
 		t.Fatalf("true -> true, nil | got %t %s", ret, err)

+ 0 - 1
runtime.go

@@ -680,7 +680,6 @@ func (runtime *Runtime) Nuke() error {
 	return os.RemoveAll(runtime.config.Root)
 	return os.RemoveAll(runtime.config.Root)
 }
 }
 
 
-
 func linkLxcStart(root string) error {
 func linkLxcStart(root string) error {
 	sourcePath, err := exec.LookPath("lxc-start")
 	sourcePath, err := exec.LookPath("lxc-start")
 	if err != nil {
 	if err != nil {

+ 0 - 1
server_unit_test.go

@@ -55,7 +55,6 @@ func TestPools(t *testing.T) {
 	}
 	}
 }
 }
 
 
-
 func TestLogEvent(t *testing.T) {
 func TestLogEvent(t *testing.T) {
 	srv := &Server{
 	srv := &Server{
 		events:    make([]utils.JSONMessage, 0, 64),
 		events:    make([]utils.JSONMessage, 0, 64),

+ 2 - 3
tags_unit_test.go

@@ -2,9 +2,9 @@ package docker
 
 
 import (
 import (
 	"github.com/dotcloud/docker/utils"
 	"github.com/dotcloud/docker/utils"
-	"testing"
-	"path"
 	"os"
 	"os"
+	"path"
+	"testing"
 )
 )
 
 
 const (
 const (
@@ -35,7 +35,6 @@ func mkTestTagStore(root string, t *testing.T) *TagStore {
 	return store
 	return store
 }
 }
 
 
-
 func TestLookupImage(t *testing.T) {
 func TestLookupImage(t *testing.T) {
 	tmp, err := utils.TestDirectory("")
 	tmp, err := utils.TestDirectory("")
 	if err != nil {
 	if err != nil {

+ 0 - 3
utils/utils.go

@@ -1208,8 +1208,6 @@ func PartParser(template, data string) (map[string]string, error) {
 	return out, nil
 	return out, nil
 }
 }
 
 
-
-
 var globalTestID string
 var globalTestID string
 
 
 // TestDirectory creates a new temporary directory and returns its path.
 // TestDirectory creates a new temporary directory and returns its path.
@@ -1246,4 +1244,3 @@ func GetCallerName(depth int) string {
 	callerShortName := parts[len(parts)-1]
 	callerShortName := parts[len(parts)-1]
 	return callerShortName
 	return callerShortName
 }
 }
-