MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 15:03:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: bufconn and listener tests for megacheck (#4827)

Browse Source 
Fixes #4824
This commit is contained in:
Bala FA 2017-08-20 12:25:08 -07:00 committed by Dee Koder
parent 2e6ee68409
commit b694c1a4d7
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/http/bufconn_test.go
View File

@ -40,8 +40,8 @@ func TestBuffConnReadTimeout(t *testing.T) {
} }
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(1)
go func() { go func() {
wg.Add(1)
defer wg.Done() defer wg.Done()
tcpConn, terr := tcpListener.AcceptTCP() tcpConn, terr := tcpListener.AcceptTCP()

44
pkg/http/listener_test.go
View File

@ -37,6 +37,13 @@ import (
var serverPort uint32 = 60000 var serverPort uint32 = 60000
// fail - as t.Fatalf() is not goroutine safe, this function behaves like t.Fatalf().
func fail(t *testing.T, template string, args ...interface{}) {
fmt.Printf(template, args...)
fmt.Println()
t.Fail()
}
func getNextPort() string { func getNextPort() string {
return strconv.Itoa(int(atomic.AddUint32(&serverPort, 1))) return strconv.Itoa(int(atomic.AddUint32(&serverPort, 1)))
} }
@ -506,10 +513,10 @@ func TestHTTPListenerAcceptPeekError(t *testing.T) {
go func() { go func() {
serverConn, aerr := listener.Accept() serverConn, aerr := listener.Accept()
if aerr == nil { if aerr == nil {
t.Fatalf("Test %d: accept: expected = <error>, got = <nil>", i+1) fail(t, "Test %d: accept: expected = <error>, got = <nil>", i+1)
} }
if serverConn != nil { if serverConn != nil {
t.Fatalf("Test %d: accept: server expected = <nil>, got = %v", i+1, serverConn) fail(t, "Test %d: accept: server expected = <nil>, got = %v", i+1, serverConn)
} }
}() }()
@ -575,10 +582,10 @@ func TestHTTPListenerAcceptTLSError(t *testing.T) {
go func() { go func() {
serverConn, aerr := listener.Accept() serverConn, aerr := listener.Accept()
if aerr == nil { if aerr == nil {
t.Fatalf("Test %d: accept: expected = <error>, got = <nil>", i+1) fail(t, "Test %d: accept: expected = <error>, got = <nil>", i+1)
} }
if serverConn != nil { if serverConn != nil {
t.Fatalf("Test %d: accept: server expected = <nil>, got = %v", i+1, serverConn) fail(t, "Test %d: accept: server expected = <nil>, got = %v", i+1, serverConn)
} }
}() }()
@ -654,10 +661,10 @@ func TestHTTPListenerAcceptError(t *testing.T) {
go func() { go func() {
serverConn, aerr := listener.Accept() serverConn, aerr := listener.Accept()
if aerr == nil { if aerr == nil {
t.Fatalf("Test %d: accept: expected = <error>, got = <nil>", i+1) fail(t, "Test %d: accept: expected = <error>, got = <nil>", i+1)
} }
if serverConn != nil { if serverConn != nil {
t.Fatalf("Test %d: accept: server expected = <nil>, got = %v", i+1, serverConn) fail(t, "Test %d: accept: server expected = <nil>, got = %v", i+1, serverConn)
} }
}() }()
@ -688,13 +695,6 @@ func TestHTTPListenerAcceptParallel(t *testing.T) {
{[]string{"127.0.0.1:0", nonLoopBackIP + ":0"}, tlsConfig, "200 OK\n"}, {[]string{"127.0.0.1:0", nonLoopBackIP + ":0"}, tlsConfig, "200 OK\n"},
} }
// As t.Fatalf() is not goroutine safe, use this closure.
fail := func(template string, args ...interface{}) {
fmt.Printf(template, args...)
fmt.Println()
t.Fail()
}
connect := func(i int, serverAddr string, secure bool, delay bool, request, reply string) { connect := func(i int, serverAddr string, secure bool, delay bool, request, reply string) {
var conn net.Conn var conn net.Conn
var err error var err error
@ -705,29 +705,29 @@ func TestHTTPListenerAcceptParallel(t *testing.T) {
conn, err = net.Dial("tcp", serverAddr) conn, err = net.Dial("tcp", serverAddr)
} }
if err != nil { if err != nil {
fail("Test %d: error: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: error: expected = <nil>, got = %v", i+1, err)
} }
if delay { if delay {
if _, err = io.WriteString(conn, request[:3]); err != nil { if _, err = io.WriteString(conn, request[:3]); err != nil {
fail("Test %d: request send: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: request send: expected = <nil>, got = %v", i+1, err)
} }
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)
if _, err = io.WriteString(conn, request[3:]); err != nil { if _, err = io.WriteString(conn, request[3:]); err != nil {
fail("Test %d: request send: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: request send: expected = <nil>, got = %v", i+1, err)
} }
} else { } else {
if _, err = io.WriteString(conn, request); err != nil { if _, err = io.WriteString(conn, request); err != nil {
fail("Test %d: request send: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: request send: expected = <nil>, got = %v", i+1, err)
} }
} }
received, err := bufio.NewReader(conn).ReadString('\n') received, err := bufio.NewReader(conn).ReadString('\n')
if err != nil { if err != nil {
fail("Test %d: reply read: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: reply read: expected = <nil>, got = %v", i+1, err)
} }
if received != reply { if received != reply {
fail("Test %d: reply: expected = %v, got = %v", i+1, reply, received) fail(t, "Test %d: reply: expected = %v, got = %v", i+1, reply, received)
} }
conn.Close() conn.Close()
@ -739,15 +739,15 @@ func TestHTTPListenerAcceptParallel(t *testing.T) {
received, err := bufio.NewReader(serverConn).ReadString('\n') received, err := bufio.NewReader(serverConn).ReadString('\n')
if err != nil { if err != nil {
fail("Test %d: request read: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: request read: expected = <nil>, got = %v", i+1, err)
} }
if received != request { if received != request {
fail("Test %d: request: expected = %v, got = %v", i+1, request, received) fail(t, "Test %d: request: expected = %v, got = %v", i+1, request, received)
} }
if _, err := io.WriteString(serverConn, reply); err != nil { if _, err := io.WriteString(serverConn, reply); err != nil {
fail("Test %d: reply send: expected = <nil>, got = %v", i+1, err) fail(t, "Test %d: reply send: expected = <nil>, got = %v", i+1, err)
} }
serverConn.Close() serverConn.Close()