Oct 20, 2023 · May 18, 2020 · May 18, 2020 · May 18, 2020 · May 18, 2020 · May 18, 2020
diff --git a/autobahn_test.go b/autobahn_test.go

 // We skip the tests related to requestMaxWindowBits as that is unimplemented due
 // to limitations in compress/flate. See https://github.com/golang/go/issues/3155
 // Same with klauspost/compress which doesn't allow adjusting the sliding window size.
 "13.3.*", "13.4.*", "13.5.*", "13.6.*",
 }

 t.SkipNow()
 }

 if os.Getenv("AUTOBAHN_FAST") != "" {
 excludedAutobahnCases = append(excludedAutobahnCases,
 "9.*", "13.*", "12.*",
 )
 }

 ctx, cancel := context.WithTimeout(context.Background(), time.Minute*15)
 defer cancel()

diff --git a/conn_test.go b/conn_test.go
 CompressionMode:      compressionMode(),
 CompressionThreshold: xrand.Int(9999),
 })
 defer tt.cleanup()

 tt.goEchoLoop(c2)

 })

 t.Run("badClose", func(t *testing.T) {
 tt, c1, _ := newConnTest(t, nil, nil)
 defer tt.cleanup()
 tt, c1, c2 := newConnTest(t, nil, nil)

 c2.CloseRead(tt.ctx)

 err := c1.Close(-1, "")
 assert.Contains(t, err, "failed to marshal close frame: status code StatusCode(-1) cannot be set")
 })

 t.Run("ping", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 c1.CloseRead(tt.ctx)
 c2.CloseRead(tt.ctx)

 t.Run("badPing", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 c2.CloseRead(tt.ctx)


 t.Run("concurrentWrite", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 tt.goDiscardLoop(c2)


 t.Run("concurrentWriteError", func(t *testing.T) {
 tt, c1, _ := newConnTest(t, nil, nil)
 defer tt.cleanup()

 _, err := c1.Writer(tt.ctx, websocket.MessageText)
 assert.Success(t, err)

 t.Run("netConn", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 n1 := websocket.NetConn(tt.ctx, c1, websocket.MessageBinary)
 n2 := websocket.NetConn(tt.ctx, c2, websocket.MessageBinary)

 t.Run("netConn/BadMsg", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 n1 := websocket.NetConn(tt.ctx, c1, websocket.MessageBinary)
 n2 := websocket.NetConn(tt.ctx, c2, websocket.MessageText)

 c2.CloseRead(tt.ctx)
 errs := xsync.Go(func() error {
 _, err := n2.Write([]byte("hello"))
 if err != nil {
 return err
 }
 return nil
 return err
 })

 _, err := ioutil.ReadAll(n1)

 t.Run("wsjson", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 tt.goEchoLoop(c2)


 t.Run("wspb", func(t *testing.T) {
 tt, c1, c2 := newConnTest(t, nil, nil)
 defer tt.cleanup()

 tt.goEchoLoop(c2)

 type connTest struct {
 t   testing.TB
 ctx context.Context

 doneFuncs []func()
 }

 func newConnTest(t testing.TB, dialOpts *websocket.DialOptions, acceptOpts *websocket.AcceptOptions) (tt *connTest, c1, c2 *websocket.Conn) {

 ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
 tt = &connTest{t: t, ctx: ctx}
 tt.appendDone(cancel)
 t.Cleanup(cancel)

 c1, c2 = wstest.Pipe(dialOpts, acceptOpts)
 if xrand.Bool() {
 c1, c2 = c2, c1
 }
 tt.appendDone(func() {
 c2.Close(websocket.StatusInternalError, "")
 c1.Close(websocket.StatusInternalError, "")
 t.Cleanup(func() {
 // We don't actually care whether this succeeds so we just run it in a separate goroutine to avoid
 // blocking the test shutting down.
 go c2.Close(websocket.StatusInternalError, "")
 go c1.Close(websocket.StatusInternalError, "")
 })

 return tt, c1, c2
 }

 func (tt *connTest) appendDone(f func()) {
 tt.doneFuncs = append(tt.doneFuncs, f)
 }

 func (tt *connTest) cleanup() {
 for i := len(tt.doneFuncs) - 1; i >= 0; i-- {
 tt.doneFuncs[i]()
 }
 }

 func (tt *connTest) goEchoLoop(c *websocket.Conn) {
 ctx, cancel := context.WithCancel(tt.ctx)

 echoLoopErr := xsync.Go(func() error {
 err := wstest.EchoLoop(ctx, c)
 return assertCloseStatus(websocket.StatusNormalClosure, err)
 })
 tt.appendDone(func() {
 tt.t.Cleanup(func() {
 cancel()
 err := <-echoLoopErr
 if err != nil {
 }
 }
 })
 tt.appendDone(func() {
 tt.t.Cleanup(func() {
 cancel()
 err := <-discardLoopErr
 if err != nil {
 }, &websocket.AcceptOptions{
 CompressionMode: bc.mode,
 })
 defer bb.cleanup()

 bb.goEchoLoop(c2)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,7 +28,6 @@ var excludedAutobahnCases = []string{

		// We skip the tests related to requestMaxWindowBits as that is unimplemented due
		// to limitations in compress/flate. See https://github.com/golang/go/issues/3155
		// Same with klauspost/compress which doesn't allow adjusting the sliding window size.
		"13.3.", "13.4.", "13.5.", "13.6.",
		}

Expand All		@@ -41,6 +40,12 @@ func TestAutobahn(t *testing.T) {
		t.SkipNow()
		}

		if os.Getenv("AUTOBAHN_FAST") != "" {
		excludedAutobahnCases = append(excludedAutobahnCases,
		"9.", "13.", "12.*",
		)
		}

		ctx, cancel := context.WithTimeout(context.Background(), time.Minute*15)
		defer cancel()

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,6 @@ func TestConn(t *testing.T) {
		CompressionMode: compressionMode(),
		CompressionThreshold: xrand.Int(9999),
		})
		defer tt.cleanup()

		tt.goEchoLoop(c2)

Expand All		@@ -67,16 +66,16 @@ func TestConn(t *testing.T) {
		})

		t.Run("badClose", func(t *testing.T) {
		tt, c1, _ := newConnTest(t, nil, nil)
		defer tt.cleanup()
		tt, c1, c2 := newConnTest(t, nil, nil)

		c2.CloseRead(tt.ctx)

		err := c1.Close(-1, "")
		assert.Contains(t, err, "failed to marshal close frame: status code StatusCode(-1) cannot be set")
		})

		t.Run("ping", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		c1.CloseRead(tt.ctx)
		c2.CloseRead(tt.ctx)
Expand All		@@ -92,7 +91,6 @@ func TestConn(t *testing.T) {

		t.Run("badPing", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		c2.CloseRead(tt.ctx)

Expand All		@@ -105,7 +103,6 @@ func TestConn(t *testing.T) {

		t.Run("concurrentWrite", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		tt.goDiscardLoop(c2)

Expand DownExpand Up		@@ -138,7 +135,6 @@ func TestConn(t *testing.T) {

		t.Run("concurrentWriteError", func(t *testing.T) {
		tt, c1, _ := newConnTest(t, nil, nil)
		defer tt.cleanup()

		_, err := c1.Writer(tt.ctx, websocket.MessageText)
		assert.Success(t, err)
Expand All		@@ -152,7 +148,6 @@ func TestConn(t *testing.T) {

		t.Run("netConn", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		n1 := websocket.NetConn(tt.ctx, c1, websocket.MessageBinary)
		n2 := websocket.NetConn(tt.ctx, c2, websocket.MessageBinary)
Expand DownExpand Up		@@ -192,17 +187,14 @@ func TestConn(t *testing.T) {

		t.Run("netConn/BadMsg", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		n1 := websocket.NetConn(tt.ctx, c1, websocket.MessageBinary)
		n2 := websocket.NetConn(tt.ctx, c2, websocket.MessageText)

		c2.CloseRead(tt.ctx)
		errs := xsync.Go(func() error {
		_, err := n2.Write([]byte("hello"))
		if err != nil {
		return err
		}
		return nil
		return err
		})

		_, err := ioutil.ReadAll(n1)
Expand All		@@ -218,7 +210,6 @@ func TestConn(t *testing.T) {

		t.Run("wsjson", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		tt.goEchoLoop(c2)

Expand DownExpand Up		@@ -248,7 +239,6 @@ func TestConn(t *testing.T) {

		t.Run("wspb", func(t *testing.T) {
		tt, c1, c2 := newConnTest(t, nil, nil)
		defer tt.cleanup()

		tt.goEchoLoop(c2)

Expand DownExpand Up		@@ -305,8 +295,6 @@ func assertCloseStatus(exp websocket.StatusCode, err error) error {
		type connTest struct {
		t testing.TB
		ctx context.Context

		doneFuncs []func()
		}

		func newConnTest(t testing.TB, dialOpts websocket.DialOptions, acceptOpts websocket.AcceptOptions) (tt connTest, c1, c2 websocket.Conn) {
Expand All		@@ -317,38 +305,30 @@ func newConnTest(t testing.TB, dialOpts websocket.DialOptions, acceptOpts webs

		ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
		tt = &connTest{t: t, ctx: ctx}
		tt.appendDone(cancel)
		t.Cleanup(cancel)

		c1, c2 = wstest.Pipe(dialOpts, acceptOpts)
		if xrand.Bool() {
		c1, c2 = c2, c1
		}
		tt.appendDone(func() {
		c2.Close(websocket.StatusInternalError, "")
		c1.Close(websocket.StatusInternalError, "")
		t.Cleanup(func() {
		// We don't actually care whether this succeeds so we just run it in a separate goroutine to avoid
		// blocking the test shutting down.
		go c2.Close(websocket.StatusInternalError, "")
		go c1.Close(websocket.StatusInternalError, "")
		})

		return tt, c1, c2
		}

		func (tt *connTest) appendDone(f func()) {
		tt.doneFuncs = append(tt.doneFuncs, f)
		}

		func (tt *connTest) cleanup() {
		for i := len(tt.doneFuncs) - 1; i >= 0; i-- {
		tt.doneFuncs[i]()
		}
		}

		func (tt connTest) goEchoLoop(c websocket.Conn) {
		ctx, cancel := context.WithCancel(tt.ctx)

		echoLoopErr := xsync.Go(func() error {
		err := wstest.EchoLoop(ctx, c)
		return assertCloseStatus(websocket.StatusNormalClosure, err)
		})
		tt.appendDone(func() {
		tt.t.Cleanup(func() {
		cancel()
		err := <-echoLoopErr
		if err != nil {
Expand All		@@ -370,7 +350,7 @@ func (tt connTest) goDiscardLoop(c websocket.Conn) {
		}
		}
		})
		tt.appendDone(func() {
		tt.t.Cleanup(func() {
		cancel()
		err := <-discardLoopErr
		if err != nil {
Expand DownExpand Up		@@ -404,7 +384,6 @@ func BenchmarkConn(b *testing.B) {
		}, &websocket.AcceptOptions{
		CompressionMode: bc.mode,
		})
		defer bb.cleanup()

		bb.goEchoLoop(c2)

Expand Down