From 264d4e8059ceb40052914c434dde482658d9a083 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Thu, 24 Oct 2013 15:09:01 -0700
Subject: [PATCH] remove log Upstream-commit:
 acc2aec988450b117c183f35a4e743b882a55113 Component: engine

---
 components/engine/container_test.go     | 1 -
 components/engine/network_proxy_test.go | 7 +------
 components/engine/runtime_test.go       | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/components/engine/container_test.go b/components/engine/container_test.go
index 9fdddc9044..ea65d0fa77 100644
--- a/components/engine/container_test.go
+++ b/components/engine/container_test.go
@@ -1593,7 +1593,6 @@ func TestMultipleVolumesFrom(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	t.Log(container3.Volumes)
 	if container3.Volumes["/test"] != container.Volumes["/test"] {
 		t.Fail()
 	}
diff --git a/components/engine/network_proxy_test.go b/components/engine/network_proxy_test.go
index c27393eb54..be506795b0 100644
--- a/components/engine/network_proxy_test.go
+++ b/components/engine/network_proxy_test.go
@@ -44,7 +44,6 @@ func NewEchoServer(t *testing.T, proto, address string) EchoServer {
 		}
 		server = &UDPEchoServer{conn: socket, testCtx: t}
 	}
-	t.Logf("EchoServer listening on %v/%v\n", proto, server.LocalAddr().String())
 	return server
 }
 
@@ -56,10 +55,7 @@ func (server *TCPEchoServer) Run() {
 				return
 			}
 			go func(client net.Conn) {
-				server.testCtx.Logf("TCP client accepted on the EchoServer\n")
-				written, err := io.Copy(client, client)
-				server.testCtx.Logf("%v bytes echoed back to the client\n", written)
-				if err != nil {
+				if _, err := io.Copy(client, client); err != nil {
 					server.testCtx.Logf("can't echo to the client: %v\n", err.Error())
 				}
 				client.Close()
@@ -79,7 +75,6 @@ func (server *UDPEchoServer) Run() {
 			if err != nil {
 				return
 			}
-			server.testCtx.Logf("Writing UDP datagram back")
 			for i := 0; i != read; {
 				written, err := server.conn.WriteTo(readBuf[i:read], from)
 				if err != nil {
diff --git a/components/engine/runtime_test.go b/components/engine/runtime_test.go
index 74feb02976..8e7c169bfb 100644
--- a/components/engine/runtime_test.go
+++ b/components/engine/runtime_test.go
@@ -340,7 +340,6 @@ func startEchoServerContainer(t *testing.T, proto string) (*Runtime, *Container,
 		} else {
 			t.Fatal(fmt.Errorf("Unknown protocol %v", proto))
 		}
-		t.Log("Trying port", strPort)
 		container, err = runtime.Create(&Config{
 			Image:     GetTestImage(runtime).ID,
 			Cmd:       []string{"sh", "-c", cmd},
@@ -353,7 +352,7 @@ func startEchoServerContainer(t *testing.T, proto string) (*Runtime, *Container,
 			nuke(runtime)
 			t.Fatal(err)
 		}
-		t.Logf("Port %v already in use", strPort)
+		t.Logf("Port %v already in use, trying another one", strPort)
 	}
 
 	if err := container.Start(&HostConfig{}); err != nil {