work around golang/go#12262

powerman · Sep 5, 2015 · 65bac2c · 65bac2c
1 parent d0a6e70
commit 65bac2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/jsonrpc2/bench_test.go b/jsonrpc2/bench_test.go
@@ -110,15 +110,17 @@ func BenchmarkGOBRPC_tcp(b *testing.B) {
 
 func BenchmarkJSONRPC2_http(b *testing.B) {
 	ts := httptest.NewServer(jsonrpc2.HTTPHandler(nil))
-	defer ts.Close()
+	// Don't close because of https://github.com/golang/go/issues/12262
+	// defer ts.Close()
 	client := jsonrpc2.NewHTTPClient(ts.URL)
 	defer client.Close()
 	benchmarkRPC(b, client)
 }
 
 func BenchmarkGOBRPC_http(b *testing.B) {
 	ts := httptest.NewServer(rpc.DefaultServer)
-	defer ts.Close()
+	// Don't close because of https://github.com/golang/go/issues/12262
+	// defer ts.Close()
 	client, err := rpc.DialHTTP("tcp", ts.URL[7:])
 	if err != nil {
 		b.Errorf("rpc.DialHTTP(tcp, %q), err = %v", ts.URL, err)

diff --git a/jsonrpc2/http_test.go b/jsonrpc2/http_test.go
@@ -52,7 +52,8 @@ func TestHTTPServer(t *testing.T) {
 	}
 
 	ts := httptest.NewServer(jsonrpc2.HTTPHandler(nil))
-	defer ts.Close()
+	// Don't close because of https://github.com/golang/go/issues/12262
+	// defer ts.Close()
 
 	for _, c := range cases {
 		req, err := http.NewRequest(c.method, ts.URL, strings.NewReader(c.body))
@@ -100,7 +101,8 @@ func TestHTTPServer(t *testing.T) {
 
 func TestHTTPClient(t *testing.T) {
 	ts := httptest.NewServer(jsonrpc2.HTTPHandler(nil))
-	defer ts.Close()
+	// Don't close because of https://github.com/golang/go/issues/12262
+	// defer ts.Close()
 	client := jsonrpc2.NewHTTPClient(ts.URL)
 	defer client.Close()