@@ -44,7 +44,7 @@ func TestHandshake(t *testing.T) {
44
44
{
45
45
name : "handshake" ,
46
46
server : func (w http.ResponseWriter , r * http.Request ) error {
47
- c , err := websocket .Accept (w , r , websocket.AcceptOptions {
47
+ c , err := websocket .Accept (w , r , & websocket.AcceptOptions {
48
48
Subprotocols : []string {"myproto" },
49
49
})
50
50
if err != nil {
@@ -54,7 +54,7 @@ func TestHandshake(t *testing.T) {
54
54
return nil
55
55
},
56
56
client : func (ctx context.Context , u string ) error {
57
- c , resp , err := websocket .Dial (ctx , u , websocket.DialOptions {
57
+ c , resp , err := websocket .Dial (ctx , u , & websocket.DialOptions {
58
58
Subprotocols : []string {"myproto" },
59
59
})
60
60
if err != nil {
@@ -81,7 +81,7 @@ func TestHandshake(t *testing.T) {
81
81
{
82
82
name : "defaultSubprotocol" ,
83
83
server : func (w http.ResponseWriter , r * http.Request ) error {
84
- c , err := websocket .Accept (w , r , websocket. AcceptOptions {} )
84
+ c , err := websocket .Accept (w , r , nil )
85
85
if err != nil {
86
86
return err
87
87
}
@@ -93,7 +93,7 @@ func TestHandshake(t *testing.T) {
93
93
return nil
94
94
},
95
95
client : func (ctx context.Context , u string ) error {
96
- c , _ , err := websocket .Dial (ctx , u , websocket.DialOptions {
96
+ c , _ , err := websocket .Dial (ctx , u , & websocket.DialOptions {
97
97
Subprotocols : []string {"meow" },
98
98
})
99
99
if err != nil {
@@ -110,7 +110,7 @@ func TestHandshake(t *testing.T) {
110
110
{
111
111
name : "subprotocol" ,
112
112
server : func (w http.ResponseWriter , r * http.Request ) error {
113
- c , err := websocket .Accept (w , r , websocket.AcceptOptions {
113
+ c , err := websocket .Accept (w , r , & websocket.AcceptOptions {
114
114
Subprotocols : []string {"echo" , "lar" },
115
115
})
116
116
if err != nil {
@@ -124,7 +124,7 @@ func TestHandshake(t *testing.T) {
124
124
return nil
125
125
},
126
126
client : func (ctx context.Context , u string ) error {
127
- c , _ , err := websocket .Dial (ctx , u , websocket.DialOptions {
127
+ c , _ , err := websocket .Dial (ctx , u , & websocket.DialOptions {
128
128
Subprotocols : []string {"poof" , "echo" },
129
129
})
130
130
if err != nil {
@@ -141,7 +141,7 @@ func TestHandshake(t *testing.T) {
141
141
{
142
142
name : "badOrigin" ,
143
143
server : func (w http.ResponseWriter , r * http.Request ) error {
144
- c , err := websocket .Accept (w , r , websocket. AcceptOptions {} )
144
+ c , err := websocket .Accept (w , r , nil )
145
145
if err == nil {
146
146
c .Close (websocket .StatusInternalError , "" )
147
147
return xerrors .New ("expected error regarding bad origin" )
@@ -151,7 +151,7 @@ func TestHandshake(t *testing.T) {
151
151
client : func (ctx context.Context , u string ) error {
152
152
h := http.Header {}
153
153
h .Set ("Origin" , "http://unauthorized.com" )
154
- c , _ , err := websocket .Dial (ctx , u , websocket.DialOptions {
154
+ c , _ , err := websocket .Dial (ctx , u , & websocket.DialOptions {
155
155
HTTPHeader : h ,
156
156
})
157
157
if err == nil {
@@ -164,7 +164,7 @@ func TestHandshake(t *testing.T) {
164
164
{
165
165
name : "acceptSecureOrigin" ,
166
166
server : func (w http.ResponseWriter , r * http.Request ) error {
167
- c , err := websocket .Accept (w , r , websocket. AcceptOptions {} )
167
+ c , err := websocket .Accept (w , r , nil )
168
168
if err != nil {
169
169
return err
170
170
}
@@ -174,7 +174,7 @@ func TestHandshake(t *testing.T) {
174
174
client : func (ctx context.Context , u string ) error {
175
175
h := http.Header {}
176
176
h .Set ("Origin" , u )
177
- c , _ , err := websocket .Dial (ctx , u , websocket.DialOptions {
177
+ c , _ , err := websocket .Dial (ctx , u , & websocket.DialOptions {
178
178
HTTPHeader : h ,
179
179
})
180
180
if err != nil {
@@ -187,7 +187,7 @@ func TestHandshake(t *testing.T) {
187
187
{
188
188
name : "acceptInsecureOrigin" ,
189
189
server : func (w http.ResponseWriter , r * http.Request ) error {
190
- c , err := websocket .Accept (w , r , websocket.AcceptOptions {
190
+ c , err := websocket .Accept (w , r , & websocket.AcceptOptions {
191
191
InsecureSkipVerify : true ,
192
192
})
193
193
if err != nil {
@@ -199,7 +199,7 @@ func TestHandshake(t *testing.T) {
199
199
client : func (ctx context.Context , u string ) error {
200
200
h := http.Header {}
201
201
h .Set ("Origin" , "https://example.com" )
202
- c , _ , err := websocket .Dial (ctx , u , websocket.DialOptions {
202
+ c , _ , err := websocket .Dial (ctx , u , & websocket.DialOptions {
203
203
HTTPHeader : h ,
204
204
})
205
205
if err != nil {
@@ -219,7 +219,7 @@ func TestHandshake(t *testing.T) {
219
219
if cookie .Value != "myvalue" {
220
220
return xerrors .Errorf ("expected %q but got %q" , "myvalue" , cookie .Value )
221
221
}
222
- c , err := websocket .Accept (w , r , websocket. AcceptOptions {} )
222
+ c , err := websocket .Accept (w , r , nil )
223
223
if err != nil {
224
224
return err
225
225
}
@@ -245,7 +245,7 @@ func TestHandshake(t *testing.T) {
245
245
hc := & http.Client {
246
246
Jar : jar ,
247
247
}
248
- c , _ , err := websocket .Dial (ctx , u , websocket.DialOptions {
248
+ c , _ , err := websocket .Dial (ctx , u , & websocket.DialOptions {
249
249
HTTPClient : hc ,
250
250
})
251
251
if err != nil {
@@ -801,7 +801,7 @@ func TestConn(t *testing.T) {
801
801
},
802
802
client : func (ctx context.Context , c * websocket.Conn ) error {
803
803
_ , _ , err := c .Read (ctx )
804
- if err == nil || strings .Contains (err .Error (), "opcode" ) {
804
+ if err == nil || ! strings .Contains (err .Error (), "opcode" ) {
805
805
return xerrors .Errorf ("expected error that contains opcode: %+v" , err )
806
806
}
807
807
return nil
@@ -839,7 +839,7 @@ func TestConn(t *testing.T) {
839
839
tls := rand .Intn (2 ) == 1
840
840
841
841
s , closeFn := testServer (t , func (w http.ResponseWriter , r * http.Request ) error {
842
- c , err := websocket .Accept (w , r , websocket. AcceptOptions {} )
842
+ c , err := websocket .Accept (w , r , nil )
843
843
if err != nil {
844
844
return err
845
845
}
@@ -854,7 +854,7 @@ func TestConn(t *testing.T) {
854
854
ctx , cancel := context .WithTimeout (context .Background (), time .Minute )
855
855
defer cancel ()
856
856
857
- opts := websocket.DialOptions {}
857
+ opts := & websocket.DialOptions {}
858
858
if tls {
859
859
opts .HTTPClient = s .Client ()
860
860
}
@@ -920,7 +920,7 @@ func TestAutobahnServer(t *testing.T) {
920
920
}
921
921
922
922
s := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
923
- c , err := websocket .Accept (w , r , websocket.AcceptOptions {
923
+ c , err := websocket .Accept (w , r , & websocket.AcceptOptions {
924
924
Subprotocols : []string {"echo" },
925
925
})
926
926
if err != nil {
@@ -1120,7 +1120,7 @@ func TestAutobahnClient(t *testing.T) {
1120
1120
1121
1121
var cases int
1122
1122
func () {
1123
- c , _ , err := websocket .Dial (ctx , wsServerURL + "/getCaseCount" , websocket. DialOptions {} )
1123
+ c , _ , err := websocket .Dial (ctx , wsServerURL + "/getCaseCount" , nil )
1124
1124
if err != nil {
1125
1125
t .Fatal (err )
1126
1126
}
@@ -1147,15 +1147,15 @@ func TestAutobahnClient(t *testing.T) {
1147
1147
ctx , cancel := context .WithTimeout (ctx , time .Second * 45 )
1148
1148
defer cancel ()
1149
1149
1150
- c , _ , err := websocket .Dial (ctx , fmt .Sprintf (wsServerURL + "/runCase?case=%v&agent=main" , i ), websocket. DialOptions {} )
1150
+ c , _ , err := websocket .Dial (ctx , fmt .Sprintf (wsServerURL + "/runCase?case=%v&agent=main" , i ), nil )
1151
1151
if err != nil {
1152
1152
t .Fatal (err )
1153
1153
}
1154
1154
echoLoop (ctx , c )
1155
1155
}()
1156
1156
}
1157
1157
1158
- c , _ , err := websocket .Dial (ctx , fmt .Sprintf (wsServerURL + "/updateReports?agent=main" ), websocket. DialOptions {} )
1158
+ c , _ , err := websocket .Dial (ctx , fmt .Sprintf (wsServerURL + "/updateReports?agent=main" ), nil )
1159
1159
if err != nil {
1160
1160
t .Fatal (err )
1161
1161
}
@@ -1207,7 +1207,7 @@ func checkWSTestIndex(t *testing.T, path string) {
1207
1207
1208
1208
func benchConn (b * testing.B , echo , stream bool , size int ) {
1209
1209
s , closeFn := testServer (b , func (w http.ResponseWriter , r * http.Request ) error {
1210
- c , err := websocket .Accept (w , r , websocket. AcceptOptions {} )
1210
+ c , err := websocket .Accept (w , r , nil )
1211
1211
if err != nil {
1212
1212
return err
1213
1213
}
@@ -1225,7 +1225,7 @@ func benchConn(b *testing.B, echo, stream bool, size int) {
1225
1225
ctx , cancel := context .WithTimeout (context .Background (), time .Minute * 5 )
1226
1226
defer cancel ()
1227
1227
1228
- c , _ , err := websocket .Dial (ctx , wsURL , websocket. DialOptions {} )
1228
+ c , _ , err := websocket .Dial (ctx , wsURL , nil )
1229
1229
if err != nil {
1230
1230
b .Fatal (err )
1231
1231
}
0 commit comments