rpc: use httptest.Server for tests

R=golang-dev, rsc1, rsc
CC=golang-dev
https://golang.org/cl/4253060

diff --git a/src/pkg/rpc/server_test.go b/src/pkg/rpc/server_test.go
index 05aaebceb487bf132a17deeb56efe01afe8f572b..344fe2457aced4d4281abd01e717c6d5b5259b6e 100644 (file)
--- a/src/pkg/rpc/server_test.go
+++ b/src/pkg/rpc/server_test.go
@@ -6,7 +6,7 @@ package rpc
 
 import (
        "fmt"
-       "http"
+       "http/httptest"
        "log"
        "net"
        "os"
@@ -103,11 +103,9 @@ func startNewServer() {
 }
 
 func startHttpServer() {
-       var l net.Listener
-       l, httpServerAddr = listenTCP()
-       httpServerAddr = l.Addr().String()
+       server := httptest.NewServer(nil)
+       httpServerAddr = server.Listener.Addr().String()
        log.Println("Test HTTP RPC server listening on", httpServerAddr)
-       go http.Serve(l, nil)
 }
 
 func TestRPC(t *testing.T) {