Fix CI

nhooyr · nhooyr · commit 029e4124defb · 2019-06-10T00:32:01.000-04:00
diff --git a/websocket.go b/websocket.go
@@ -660,7 +660,7 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, opcode opcode, p []byte
 	return n, nil
 }
 
-func (c *Conn) realWriteFrame(ctx context.Context, h header, p []byte) (n int, err error){
+func (c *Conn) realWriteFrame(ctx context.Context, h header, p []byte) (n int, err error) {
 	defer func() {
 		if err != nil {
 			select {
diff --git a/websocket_test.go b/websocket_test.go
@@ -415,8 +415,9 @@ func TestHandshake(t *testing.T) {
 					return err
 				}
 
+				err = <-errc
 				c.Close(websocket.StatusNormalClosure, "")
-				return <-errc
+				return err
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ func (c *Conn) writeFrame(ctx context.Context, fin bool, opcode opcode, p []byte`
`660`	`660`	`return n, nil`
`661`	`661`	`}`
`662`	`662`
`663`		`-func (c *Conn) realWriteFrame(ctx context.Context, h header, p []byte) (n int, err error){`
	`663`	`+func (c *Conn) realWriteFrame(ctx context.Context, h header, p []byte) (n int, err error) {`
`664`	`664`	`defer func() {`
`665`	`665`	`if err != nil {`
`666`	`666`	`select {`
Original file line number	Diff line number	Diff line change
`@@ -415,8 +415,9 @@ func TestHandshake(t *testing.T) {`
`415`	`415`	`return err`
`416`	`416`	`}`
`417`	`417`
	`418`	`+ err = <-errc`
`418`	`419`	`c.Close(websocket.StatusNormalClosure, "")`
`419`		`- return <-errc`
	`420`	`+ return err`
`420`	`421`	`},`
`421`	`422`	`},`
`422`	`423`	`{`