Properly implement request read timeout via SetReadDeadline(). Implement response write timeout

1 files changed, 8 insertions, 32 deletions

diff --git a/server_timing_test.go b/server_timing_test.go
index af8fb09..a48db45 100644
--- a/server_timing_test.go
+++ b/server_timing_test.go
@@ -78,22 +78,6 @@ func BenchmarkNetHTTPServerPost10000ReqPerConn(b *testing.B) {
 	benchmarkNetHTTPServerPost(b, 10000)
 }
 
-func BenchmarkServerGetRequestReadTimeout1ReqPerConn(b *testing.B) {
-	benchmarkServerGetRequestReadTimeout(b, 1)
-}
-
-func BenchmarkServerGetRequestReadTimeout2ReqPerConn(b *testing.B) {
-	benchmarkServerGetRequestReadTimeout(b, 2)
-}
-
-func BenchmarkServerGetRequestReadTimeout10ReqPerConn(b *testing.B) {
-	benchmarkServerGetRequestReadTimeout(b, 10)
-}
-
-func BenchmarkServerGetRequestReadTimeout10000ReqPerConn(b *testing.B) {
-	benchmarkServerGetRequestReadTimeout(b, 10000)
-}
-
 func BenchmarkServerTimeoutError(b *testing.B) {
 	requestsPerConn := 10
 	ch := make(chan struct{}, b.N)
@@ -153,6 +137,14 @@ func (c *fakeServerConn) Close() error {
 	return nil
 }
 
+func (c *fakeServerConn) SetReadDeadline(t time.Time) error {
+	return nil
+}
+
+func (c *fakeServerConn) SetWriteDeadline(t time.Time) error {
+	return nil
+}
+
 type fakeListener struct {
 	addr   net.TCPAddr
 	stop   chan struct{}
@@ -280,22 +272,6 @@ func benchmarkNetHTTPServerPost(b *testing.B, requestsPerConn int) {
 	verifyRequestsServed(b, requestsSent, ch)
 }
 
-func benchmarkServerGetRequestReadTimeout(b *testing.B, requestsPerConn int) {
-	ch := make(chan struct{}, b.N)
-	s := &Server{
-		Handler: func(ctx *RequestCtx) {
-			if !ctx.Request.Header.IsMethodGet() {
-				b.Fatalf("Unexpected request method: %s", ctx.Request.Header.Method)
-			}
-			ctx.Success("text/plain", fakeResponse)
-			registerServedRequest(b, ch)
-		},
-		RequestReadTimeout: 5 * time.Second,
-	}
-	requestsSent := benchmarkServer(b, &testServer{s}, requestsPerConn, getRequest)
-	verifyRequestsServed(b, requestsSent, ch)
-}
-
 func registerServedRequest(b *testing.B, ch chan<- struct{}) {
 	select {
 	case ch <- struct{}{}: