Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parallel Tests: #66 #149

Merged
merged 2 commits into from
Dec 9, 2024
Merged

Parallel Tests: #66 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a7da91
Rework MockServer Accept, update tests
MaxMaeder Nov 29, 2024
c500afe
Refactor port channel
MaxMaeder Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codec/websocket/client_performance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestClientReadWrite(t *testing.T) {
}
dur := time.Duration(idur) * time.Second

s := &MockServer{}
s := NewMockServer()

go func() {
defer s.Close()
Expand Down
104 changes: 46 additions & 58 deletions codec/websocket/stream_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"io"
"net/http"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/talostrading/sonic"
Expand All @@ -23,11 +22,12 @@ func assertState(t *testing.T, ws *Stream, expected StreamState) {
func TestClientServerSendsInvalidCloseCode(t *testing.T) {
assert := assert.New(t)

srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -59,7 +59,6 @@ func TestClientServerSendsInvalidCloseCode(t *testing.T) {
assert.Equal(reason, "")
}
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -70,7 +69,7 @@ func TestClientServerSendsInvalidCloseCode(t *testing.T) {
}

done := false
ws.AsyncHandshake("ws://localhost:8080", func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
if err != nil {
t.Fatal(err)
}
Expand All @@ -90,11 +89,12 @@ func TestClientServerSendsInvalidCloseCode(t *testing.T) {
func TestClientEchoCloseCode(t *testing.T) {
assert := assert.New(t)

srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -122,7 +122,6 @@ func TestClientEchoCloseCode(t *testing.T) {
assert.Equal(reason, "something")
}
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -133,7 +132,7 @@ func TestClientEchoCloseCode(t *testing.T) {
}

done := false
ws.AsyncHandshake("ws://localhost:8080", func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
if err != nil {
t.Fatal(err)
}
Expand All @@ -155,11 +154,12 @@ func TestClientSendPingWithInvalidPayload(t *testing.T) {
// the connection immediately with 1002/Protocol Error.
assert := assert.New(t)

srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -191,7 +191,6 @@ func TestClientSendPingWithInvalidPayload(t *testing.T) {
assert.Empty(reason)
}
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -202,7 +201,7 @@ func TestClientSendPingWithInvalidPayload(t *testing.T) {
}

done := false
ws.AsyncHandshake("ws://localhost:8080", func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
if err != nil {
t.Fatal(err)
}
Expand All @@ -223,11 +222,12 @@ func TestClientSendPingWithInvalidPayload(t *testing.T) {
func TestClientSendMessageWithPayload126(t *testing.T) {
assert := assert.New(t)

srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
Expand All @@ -242,7 +242,6 @@ func TestClientSendMessageWithPayload126(t *testing.T) {

frame.WriteTo(srv.conn)
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -253,7 +252,7 @@ func TestClientSendMessageWithPayload126(t *testing.T) {
}

done := false
ws.AsyncHandshake("ws://localhost:8080", func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
if err != nil {
t.Fatal(err)
}
Expand All @@ -277,11 +276,12 @@ func TestClientSendMessageWithPayload126(t *testing.T) {
func TestClientSendMessageWithPayload127(t *testing.T) {
assert := assert.New(t)

srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
Expand All @@ -296,7 +296,6 @@ func TestClientSendMessageWithPayload127(t *testing.T) {

frame.WriteTo(srv.conn)
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -307,7 +306,7 @@ func TestClientSendMessageWithPayload127(t *testing.T) {
}

done := false
ws.AsyncHandshake("ws://localhost:8080", func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
if err != nil {
t.Fatal(err)
}
Expand All @@ -329,20 +328,29 @@ func TestClientSendMessageWithPayload127(t *testing.T) {
}

func TestClientReconnectOnFailedRead(t *testing.T) {
srv := NewMockServer()
port := 0

go func() {
for i := 0; i < 10; i++ {
srv := &MockServer{}

err := srv.Accept("localhost:8080")
var err error
if port != 0 {
err = srv.Accept(fmt.Sprintf("localhost:%d", port))
} else {
err = srv.Accept(MockServerDynamicAddr)
}
if err != nil {
panic(err)
}

srv.Write([]byte("hello"))
srv.Close()

srv = NewMockServer()
}
}()
time.Sleep(10 * time.Millisecond)

port = <- srv.portChan

ioc := sonic.MustIO()
defer ioc.Close()
Expand Down Expand Up @@ -389,7 +397,7 @@ func TestClientReconnectOnFailedRead(t *testing.T) {
}

connect = func() {
ws.AsyncHandshake("ws://localhost:8080", onHandshake)
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", port), onHandshake)
}

connect()
Expand Down Expand Up @@ -465,17 +473,16 @@ func TestClientFailedHandshakeNoServer(t *testing.T) {
}

func TestClientSuccessfulHandshake(t *testing.T) {
srv := &MockServer{}
srv := NewMockServer()

go func() {
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -501,7 +508,7 @@ func TestClientSuccessfulHandshake(t *testing.T) {

assertState(t, ws, StateHandshake)

ws.AsyncHandshake("ws://localhost:8080", func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
if err != nil {
assertState(t, ws, StateTerminated)
} else {
Expand All @@ -524,17 +531,16 @@ func TestClientSuccessfulHandshake(t *testing.T) {
}

func TestClientSuccessfulHandshakeWithExtraHeaders(t *testing.T) {
srv := &MockServer{}
srv := NewMockServer()

go func() {
defer srv.Close()

err := srv.Accept("localhost:8080")
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}
}()
time.Sleep(10 * time.Millisecond)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -558,7 +564,7 @@ func TestClientSuccessfulHandshakeWithExtraHeaders(t *testing.T) {
}

ws.AsyncHandshake(
"ws://localhost:8080",
fmt.Sprintf("ws://localhost:%d", <-srv.portChan),
func(err error) {
if err != nil {
assertState(t, ws, StateTerminated)
Expand Down Expand Up @@ -1644,36 +1650,27 @@ func TestClientAsyncCloseHandshakePeerStarts(t *testing.T) {
func TestClientAbnormalClose(t *testing.T) {
assert := assert.New(t)

portChan := make(chan int, 1)
srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:0", func(port int) {
if port <= 0 {
panic(fmt.Sprintf("Got invalid port from MockServer: %d", port))
}
portChan <- port
})
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}

// Simulate an abnormal closure (close the TCP connection without sending a WebSocket close frame)
srv.Close()
}()
time.Sleep(10 * time.Millisecond)

wsURI := fmt.Sprintf("ws://localhost:%d", <-portChan)

ioc := sonic.MustIO()
defer ioc.Close()

ws, err := NewWebsocketStream(ioc, nil, RoleClient)
assert.Nil(err)

err = ws.Handshake(wsURI)
err = ws.Handshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan))
assert.Nil(err)
assert.Equal(ws.State(), StateActive) // Verify WebSocket active

Expand All @@ -1693,28 +1690,19 @@ func TestClientAbnormalClose(t *testing.T) {
func TestClientAsyncAbnormalClose(t *testing.T) {
assert := assert.New(t)

portChan := make(chan int, 1)
srv := NewMockServer()

go func() {
srv := &MockServer{}
defer srv.Close()

err := srv.Accept("localhost:0", func(port int) {
if port <= 0 {
panic(fmt.Sprintf("Got invalid port from MockServer: %d", port))
}
portChan <- port
})
err := srv.Accept(MockServerDynamicAddr)
if err != nil {
panic(err)
}

// Simulate an abnormal closure (close the TCP connection without sending a WebSocket close frame)
srv.Close()
}()
time.Sleep(10 * time.Millisecond)

wsURI := fmt.Sprintf("ws://localhost:%d", <-portChan)

ioc := sonic.MustIO()
defer ioc.Close()
Expand All @@ -1723,7 +1711,7 @@ func TestClientAsyncAbnormalClose(t *testing.T) {
assert.Nil(err)

done := false
ws.AsyncHandshake(wsURI, func(err error) {
ws.AsyncHandshake(fmt.Sprintf("ws://localhost:%d", <-srv.portChan), func(err error) {
assert.Nil(err)
assert.Equal(ws.State(), StateActive) // Verify WebSocket active

Expand Down
Loading
Loading