Commit ce65b725 authored by Robert Hencke's avatar Robert Hencke Committed by Russ Cox

websocket: use httptest.Server for tests

R=rsc
CC=golang-dev
https://golang.org/cl/4266044
parent 59d2acd2
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"http" "http"
"http/httptest"
"io" "io"
"log" "log"
"net" "net"
...@@ -22,15 +23,11 @@ var once sync.Once ...@@ -22,15 +23,11 @@ var once sync.Once
func echoServer(ws *Conn) { io.Copy(ws, ws) } func echoServer(ws *Conn) { io.Copy(ws, ws) }
func startServer() { 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("/echo", Handler(echoServer))
http.Handle("/echoDraft75", Draft75Handler(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 // Test the getChallengeResponse function with values from section
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment