@@ -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 {

@@ -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)

@@ -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 {

@@ -55,7 +55,6 @@ func TestPools(t *testing.T) {

 	}

 }

-

 func TestLogEvent(t *testing.T) {

 	srv := &Server{

 		events:    make([]utils.JSONMessage, 0, 64),

@@ -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 {

@@ -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

 }

-