Skip to content

Commit 5404d35

Browse files
committed
Make CI pass
1 parent 5add79d commit 5404d35

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

websocket.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -762,24 +762,24 @@ func (c *Conn) exportedClose(code StatusCode, reason string) error {
762762
return c.writeClose(p, ce, true)
763763
}
764764

765-
func (c *Conn) writeClose(p []byte, err error, us bool) error {
765+
func (c *Conn) writeClose(p []byte, cerr error, us bool) error {
766766
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
767767
defer cancel()
768768

769769
// If this fails, the connection had to have died.
770-
err = c.writeControl(ctx, opClose, p)
770+
err := c.writeControl(ctx, opClose, p)
771771
if err != nil {
772772
return err
773773
}
774774

775775
if us {
776-
err = xerrors.Errorf("sent close frame: %w", err)
776+
cerr = xerrors.Errorf("sent close frame: %w", cerr)
777777
} else {
778-
err = xerrors.Errorf("received close frame: %w", err)
778+
cerr = xerrors.Errorf("received close frame: %w", cerr)
779779
}
780780

781-
c.close(err)
782-
if !xerrors.Is(c.closeErr, err) {
781+
c.close(cerr)
782+
if !xerrors.Is(c.closeErr, cerr) {
783783
return c.closeErr
784784
}
785785

websocket_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ func TestHandshake(t *testing.T) {
451451
err = c.Ping(ctx)
452452

453453
var ce websocket.CloseError
454-
if !xerrors.As(err, &ce) || ce.Code != websocket.StatusPolicyViolation {
454+
if !xerrors.As(err, &ce) || ce.Code != websocket.StatusMessageTooBig {
455455
return xerrors.Errorf("unexpected error: %w", err)
456456
}
457457

0 commit comments

Comments
 (0)