diff options
| author | Robert Hencke <robert.hencke@gmail.com> | 2011-03-06 17:05:12 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2011-03-06 17:05:12 -0500 |
| commit | ce65b7250805253367cce756e03cda7c7f77df43 (patch) | |
| tree | aff9ead63803444bd3fc67853ae55d0e93c8125b | |
| parent | 59d2acd2d4a3434f49daaa478f2fab1e29f362db (diff) | |
| download | go-ce65b7250805253367cce756e03cda7c7f77df43.tar.gz go-ce65b7250805253367cce756e03cda7c7f77df43.zip | |
websocket: use httptest.Server for tests
R=rsc
CC=golang-dev
https://golang.org/cl/4266044
| -rw-r--r-- | src/pkg/websocket/websocket_test.go | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/pkg/websocket/websocket_test.go b/src/pkg/websocket/websocket_test.go index 204a9de1e1..14d708a3ba 100644 --- a/src/pkg/websocket/websocket_test.go +++ b/src/pkg/websocket/websocket_test.go @@ -9,6 +9,7 @@ import ( "bytes" "fmt" "http" + "http/httptest" "io" "log" "net" @@ -22,15 +23,11 @@ var once sync.Once func echoServer(ws *Conn) { io.Copy(ws, ws) } func startServer() { - l, e := net.Listen("tcp", "127.0.0.1:0") // any available address - if e != nil { - log.Fatalf("net.Listen tcp :0 %v", e) - } - serverAddr = l.Addr().String() - log.Print("Test WebSocket server listening on ", serverAddr) http.Handle("/echo", Handler(echoServer)) http.Handle("/echoDraft75", Draft75Handler(echoServer)) - go http.Serve(l, nil) + server := httptest.NewServer(nil) + serverAddr = server.Listener.Addr().String() + log.Print("Test WebSocket server listening on ", serverAddr) } // Test the getChallengeResponse function with values from section |