Merge pull request #37 from dmcgowan/random-test-ports

Use random ports in unit tests
moby · Jan 22, 2015 · d716217 · d716217
2 parents cf6cfc2 + b5d2660
commit d716217
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 27 deletions.
diff --git a/spdy_bench_test.go b/spdy_bench_test.go
@@ -9,32 +9,28 @@ import (
 	"testing"
 )
 
-const (
-	LISTEN_ADDRESS = "127.0.0.1:7777"
-)
-
-func configureServer() (io.Closer, *sync.WaitGroup) {
+func configureServer() (io.Closer, string, *sync.WaitGroup) {
 	authenticated = true
 	wg := &sync.WaitGroup{}
-	server, serverErr := runServer(LISTEN_ADDRESS, wg)
+	server, listen, serverErr := runServer(wg)
 
 	if serverErr != nil {
 		panic(serverErr)
 	}
 
-	return server, wg
+	return server, listen, wg
 }
 
 func BenchmarkDial10000(b *testing.B) {
-	server, wg := configureServer()
+	server, addr, wg := configureServer()
 
 	defer func() {
 		server.Close()
 		wg.Wait()
 	}()
 
 	for i := 0; i < b.N; i++ {
-		conn, dialErr := net.Dial("tcp", LISTEN_ADDRESS)
+		conn, dialErr := net.Dial("tcp", addr)
 		if dialErr != nil {
 			panic(fmt.Sprintf("Error dialing server: %s", dialErr))
 		}
@@ -43,15 +39,15 @@ func BenchmarkDial10000(b *testing.B) {
 }
 
 func BenchmarkDialWithSPDYStream10000(b *testing.B) {
-	server, wg := configureServer()
+	server, addr, wg := configureServer()
 
 	defer func() {
 		server.Close()
 		wg.Wait()
 	}()
 
 	for i := 0; i < b.N; i++ {
-		conn, dialErr := net.Dial("tcp", LISTEN_ADDRESS)
+		conn, dialErr := net.Dial("tcp", addr)
 		if dialErr != nil {
 			b.Fatalf("Error dialing server: %s", dialErr)
 		}
@@ -70,15 +66,15 @@ func BenchmarkDialWithSPDYStream10000(b *testing.B) {
 }
 
 func benchmarkStreamWithDataAndSize(size uint64, b *testing.B) {
-	server, wg := configureServer()
+	server, addr, wg := configureServer()
 
 	defer func() {
 		server.Close()
 		wg.Wait()
 	}()
 
 	for i := 0; i < b.N; i++ {
-		conn, dialErr := net.Dial("tcp", LISTEN_ADDRESS)
+		conn, dialErr := net.Dial("tcp", addr)
 		if dialErr != nil {
 			b.Fatalf("Error dialing server: %s", dialErr)
 		}

diff --git a/spdy_test.go b/spdy_test.go
@@ -2,7 +2,6 @@ package spdystream
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"net"
 	"net/http"
@@ -13,8 +12,7 @@ import (
 
 func TestSpdyStreams(t *testing.T) {
 	var wg sync.WaitGroup
-	listen := "localhost:7443"
-	server, serverErr := runServer(listen, &wg)
+	server, listen, serverErr := runServer(&wg)
 	if serverErr != nil {
 		t.Fatalf("Error initializing server: %s", serverErr)
 	}
@@ -156,8 +154,7 @@ func TestSpdyStreams(t *testing.T) {
 
 func TestPing(t *testing.T) {
 	var wg sync.WaitGroup
-	listen := "localhost:7543"
-	server, serverErr := runServer(listen, &wg)
+	server, listen, serverErr := runServer(&wg)
 	if serverErr != nil {
 		t.Fatalf("Error initializing server: %s", serverErr)
 	}
@@ -190,8 +187,7 @@ func TestPing(t *testing.T) {
 
 func TestHalfClose(t *testing.T) {
 	var wg sync.WaitGroup
-	listen := "localhost:7643"
-	server, serverErr := runServer(listen, &wg)
+	server, listen, serverErr := runServer(&wg)
 	if serverErr != nil {
 		t.Fatalf("Error initializing server: %s", serverErr)
 	}
@@ -263,8 +259,7 @@ func TestUnexpectedRemoteConnectionClosed(t *testing.T) {
 		{closeReceiver: false, closeSender: false},
 	}
 	for tix, tc := range tt {
-		listen := fmt.Sprintf("localhost:774%d", tix)
-		listener, listenErr := net.Listen("tcp", listen)
+		listener, listenErr := net.Listen("tcp", "localhost:0")
 		if listenErr != nil {
 			t.Fatalf("Error listening: %v", listenErr)
 		}
@@ -283,7 +278,7 @@ func TestUnexpectedRemoteConnectionClosed(t *testing.T) {
 			})
 		}()
 
-		conn, dialErr := net.Dial("tcp", listen)
+		conn, dialErr := net.Dial("tcp", listener.Addr().String())
 		if dialErr != nil {
 			t.Fatalf("Error dialing server: %s", dialErr)
 		}
@@ -352,10 +347,10 @@ func authStreamHandler(stream *Stream) {
 	MirrorStreamHandler(stream)
 }
 
-func runServer(listen string, wg *sync.WaitGroup) (io.Closer, error) {
-	listener, listenErr := net.Listen("tcp", listen)
+func runServer(wg *sync.WaitGroup) (io.Closer, string, error) {
+	listener, listenErr := net.Listen("tcp", "localhost:0")
 	if listenErr != nil {
-		return nil, listenErr
+		return nil, "", listenErr
 	}
 	wg.Add(1)
 	go func() {
@@ -371,5 +366,5 @@ func runServer(listen string, wg *sync.WaitGroup) (io.Closer, error) {
 		}
 		wg.Done()
 	}()
-	return listener, nil
+	return listener, listener.Addr().String(), nil
 }