Merge pull request #81 from dmcgowan/spdy-cleanup

Test and misc cleanup

Author: dmcgowan

spdy/conn_test.go

@@ -24,20 +24,25 @@ type RecvMultiMessage struct {
 }
 
 func TestMultiTcpByteStream(t *testing.T) {
+	listener, listenerErr := net.Listen("tcp", "localhost:0")
+	if listenerErr != nil {
+		t.Fatalf("Error creating byte stream listener: %s", listenerErr)
+	}
+	defer listener.Close()
 	wait := make(chan bool)
 	client := func(t *testing.T, sender libchan.Sender, s *Transport) {
 		<-wait
-		both, connErr := net.Dial("tcp", "localhost:9272")
+		both, connErr := net.Dial("tcp", listener.Addr().String())
 		if connErr != nil {
 			t.Fatalf("Error creating connection: %s", connErr)
 		}
 
-		in, connErr := net.Dial("tcp", "localhost:9272")
+		in, connErr := net.Dial("tcp", listener.Addr().String())
 		if connErr != nil {
 			t.Fatalf("Error creating connection: %s", connErr)
 		}
 
-		out, connErr := net.Dial("tcp", "localhost:9272")
+		out, connErr := net.Dial("tcp", listener.Addr().String())
 		if connErr != nil {
 			t.Fatalf("Error creating connection: %s", connErr)
 		}
@@ -98,10 +103,6 @@ func TestMultiTcpByteStream(t *testing.T) {
 		out.Close()
 	}
 	server := func(t *testing.T, receiver libchan.Receiver, s *Transport) {
-		listener, listenerErr := net.Listen("tcp", "localhost:9272")
-		if listenerErr != nil {
-			t.Fatalf("Error creating byte stream listener: %s", listenerErr)
-		}
 		s.RegisterListener(listener)
 		close(wait)
 

spdy/pipe.go

@@ -1,7 +1,6 @@
 package spdy
 
 import (
-	"io"
 	"net"
 
 	"github.com/docker/libchan"
@@ -68,10 +67,6 @@ func (p *pipeSender) Close() error {
 	return p.session.Close()
 }
 
-func (p *pipeSender) CreateByteStream() (io.ReadWriteCloser, error) {
-	return p.session.createByteStream()
-}
-
 func (p *pipeReceiver) Receive(message interface{}) error {
 	return p.receiver.Receive(message)
 }

spdy/proxy_test.go

@@ -174,13 +174,13 @@ func SpawnProxyTest(t *testing.T, client PipeSenderRoutine, server PipeReceiverR
 
 	timeout := time.After(ClientServerTimeout)
 
-	for endClient != nil || endServer != nil {
+	for endClient != nil || endServer != nil || endProxy != nil {
 		select {
 		case <-endProxy:
 			if t.Failed() {
 				t.Fatal("Proxy failed")
 			}
-			endClient = nil
+			endProxy = nil
 		case <-endClient:
 			if t.Failed() {
 				t.Fatal("Client failed")

spdy/session.go

@@ -250,7 +250,7 @@ func (s *Transport) RegisterListener(listener net.Listener) {
 			conn, err := listener.Accept()
 			if err != nil {
 				// Log
-				continue
+				break
 			}
 			err = s.RegisterConn(conn)
 			if err != nil {