Browse code

remove log

Victor Vieux authored on 2013/10/25 07:09:01
Showing 3 changed files
... ...
@@ -1593,7 +1593,6 @@ func TestMultipleVolumesFrom(t *testing.T) {
1593 1593
 		t.Fatal(err)
1594 1594
 	}
1595 1595
 
1596
-	t.Log(container3.Volumes)
1597 1596
 	if container3.Volumes["/test"] != container.Volumes["/test"] {
1598 1597
 		t.Fail()
1599 1598
 	}
... ...
@@ -44,7 +44,6 @@ func NewEchoServer(t *testing.T, proto, address string) EchoServer {
44 44
 		}
45 45
 		server = &UDPEchoServer{conn: socket, testCtx: t}
46 46
 	}
47
-	t.Logf("EchoServer listening on %v/%v\n", proto, server.LocalAddr().String())
48 47
 	return server
49 48
 }
50 49
 
... ...
@@ -56,10 +55,7 @@ func (server *TCPEchoServer) Run() {
56 56
 				return
57 57
 			}
58 58
 			go func(client net.Conn) {
59
-				server.testCtx.Logf("TCP client accepted on the EchoServer\n")
60
-				written, err := io.Copy(client, client)
61
-				server.testCtx.Logf("%v bytes echoed back to the client\n", written)
62
-				if err != nil {
59
+				if _, err := io.Copy(client, client); err != nil {
63 60
 					server.testCtx.Logf("can't echo to the client: %v\n", err.Error())
64 61
 				}
65 62
 				client.Close()
... ...
@@ -79,7 +75,6 @@ func (server *UDPEchoServer) Run() {
79 79
 			if err != nil {
80 80
 				return
81 81
 			}
82
-			server.testCtx.Logf("Writing UDP datagram back")
83 82
 			for i := 0; i != read; {
84 83
 				written, err := server.conn.WriteTo(readBuf[i:read], from)
85 84
 				if err != nil {
... ...
@@ -340,7 +340,6 @@ func startEchoServerContainer(t *testing.T, proto string) (*Runtime, *Container,
340 340
 		} else {
341 341
 			t.Fatal(fmt.Errorf("Unknown protocol %v", proto))
342 342
 		}
343
-		t.Log("Trying port", strPort)
344 343
 		container, err = runtime.Create(&Config{
345 344
 			Image:     GetTestImage(runtime).ID,
346 345
 			Cmd:       []string{"sh", "-c", cmd},
... ...
@@ -353,7 +352,7 @@ func startEchoServerContainer(t *testing.T, proto string) (*Runtime, *Container,
353 353
 			nuke(runtime)
354 354
 			t.Fatal(err)
355 355
 		}
356
-		t.Logf("Port %v already in use", strPort)
356
+		t.Logf("Port %v already in use, trying another one", strPort)
357 357
 	}
358 358
 
359 359
 	if err := container.Start(&HostConfig{}); err != nil {