Merge pull request #18722 from calavera/remove_unused_packages

Remove timeoutconn package, it's not used anywhere
This commit is contained in:
Vincent Demeester 2015-12-16 20:56:43 +01:00
commit d0b9fc9422
2 changed files with 0 additions and 61 deletions

View file

@ -1,28 +0,0 @@
// Package timeoutconn provides overridden net.Conn that supports deadline (timeout).
package timeoutconn
import (
"net"
"time"
)
// New creates a net.Conn with a timeout for every Read operation.
func New(netConn net.Conn, timeout time.Duration) net.Conn {
return &conn{netConn, timeout}
}
// A net.Conn that sets a deadline for every Read operation.
// FIXME was documented the deadline was on Write operation too but not implement
type conn struct {
net.Conn
timeout time.Duration
}
func (c *conn) Read(b []byte) (int, error) {
if c.timeout > 0 {
if err := c.Conn.SetReadDeadline(time.Now().Add(c.timeout)); err != nil {
return 0, err
}
}
return c.Conn.Read(b)
}

View file

@ -1,33 +0,0 @@
package timeoutconn
import (
"bufio"
"fmt"
"net"
"net/http"
"net/http/httptest"
"testing"
"time"
)
func TestRead(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, "hello")
}))
defer ts.Close()
conn, err := net.Dial("tcp", ts.URL[7:])
if err != nil {
t.Fatalf("failed to create connection to %q: %v", ts.URL, err)
}
tconn := New(conn, 1*time.Second)
if _, err = bufio.NewReader(tconn).ReadString('\n'); err == nil {
t.Fatalf("expected timeout error, got none")
}
if _, err := fmt.Fprintf(tconn, "GET / HTTP/1.0\r\n\r\n"); err != nil {
t.Errorf("unexpected error: %v", err)
}
if _, err = bufio.NewReader(tconn).ReadString('\n'); err != nil {
t.Errorf("unexpected error: %v", err)
}
}